aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/stv0299.c
diff options
context:
space:
mode:
authorPeter Beutner <p.beutner@gmx.net>2006-01-09 12:32:43 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-09 12:32:43 -0500
commit400b7083fbcc8e7a1157a82aa126977179873268 (patch)
tree67669ca5f0e0ddd6858cf0c7c5b485ec7554ca40 /drivers/media/dvb/frontends/stv0299.c
parentd8e6acf2ec120f3dc7929581d87b5b8b3ff21627 (diff)
V4L/DVB (3194): 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> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/dvb/frontends/stv0299.c')
-rw-r--r--drivers/media/dvb/frontends/stv0299.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 1085bd15d56d..5bcd00f792e6 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -394,7 +394,7 @@ static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltag
394 }; 394 };
395} 395}
396 396
397static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) 397static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long cmd)
398{ 398{
399 struct stv0299_state* state = fe->demodulator_priv; 399 struct stv0299_state* state = fe->demodulator_priv;
400 u8 reg0x08; 400 u8 reg0x08;
@@ -414,7 +414,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd)
414 414
415 cmd = cmd << 1; 415 cmd = cmd << 1;
416 if (debug_legacy_dish_switch) 416 if (debug_legacy_dish_switch)
417 printk ("%s switch command: 0x%04x\n",__FUNCTION__, cmd); 417 printk ("%s switch command: 0x%04lx\n",__FUNCTION__, cmd);
418 418
419 do_gettimeofday (&nexttime); 419 do_gettimeofday (&nexttime);
420 if (debug_legacy_dish_switch) 420 if (debug_legacy_dish_switch)