diff options
| author | Hans Verkuil <devnull@localhost> | 2005-12-19 09:37:26 +0000 |
|---|---|---|
| committer | Hans Verkuil <devnull@localhost> | 2005-12-19 09:37:26 +0000 |
| commit | 1520a3cb54dee708171201dc964a16747079be0d (patch) | |
| tree | f8579d3f0817f1d8b548d7fb4d2801663f73c9f5 /linux/drivers/media/dvb/frontends/stv0299.c | |
| parent | c7d2857d16be5edb8e5e2e718012cd350b9a7d7b (diff) | |
| download | mediapointer-dvb-s2-1520a3cb54dee708171201dc964a16747079be0d.tar.gz mediapointer-dvb-s2-1520a3cb54dee708171201dc964a16747079be0d.tar.bz2 | |
Revert one 64-bit fix and improved other 64-bit fixes
- Reverted objectionable fix in saa7146_hlp.c
- Merged in improved dvb 64-bit fixes from Peter Beutner.
Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stv0299.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 1085bd15d..5bcd00f79 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -394,7 +394,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag }; } -static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) +static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long cmd) { struct stv0299_state* state = fe->demodulator_priv; u8 reg0x08; @@ -414,7 +414,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) cmd = cmd << 1; if (debug_legacy_dish_switch) - printk ("%s switch command: 0x%04x\n",__FUNCTION__, cmd); + printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd); do_gettimeofday (&nexttime); if (debug_legacy_dish_switch) |