diff options
author | Michael Krufky <mkrufky@m1k.net> | 2005-11-09 00:36:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:07 -0500 |
commit | 87f0783159783a315c68a00e50706cd01aa10511 (patch) | |
tree | 83eed4a6f9b1abbca8227c59d2a96878bd559e24 | |
parent | ccd7b6500275e34e2fb90bcf316a5a721d5cdb52 (diff) |
[PATCH] v4l: 634: implemented tuner set standby on cx88 init
- Implemented TUNER_SET_STANDBY on cx88 init.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/media/video/cx88/cx88-core.c | 1 | ||||
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c index dc5c5c1f3461..3ce000a5b7f9 100644 --- a/drivers/media/video/cx88/cx88-core.c +++ b/drivers/media/video/cx88/cx88-core.c | |||
@@ -1146,6 +1146,7 @@ struct cx88_core* cx88_core_get(struct pci_dev *pci) | |||
1146 | /* init hardware */ | 1146 | /* init hardware */ |
1147 | cx88_reset(core); | 1147 | cx88_reset(core); |
1148 | cx88_i2c_init(core,pci); | 1148 | cx88_i2c_init(core,pci); |
1149 | cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL); | ||
1149 | cx88_card_setup(core); | 1150 | cx88_card_setup(core); |
1150 | cx88_ir_init(core,pci); | 1151 | cx88_ir_init(core,pci); |
1151 | 1152 | ||
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index f3efb07a7613..ecb12c80b380 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -403,6 +403,9 @@ static int dvb_register(struct cx8802_dev *dev) | |||
403 | /* Put the analog decoder in standby to keep it quiet */ | 403 | /* Put the analog decoder in standby to keep it quiet */ |
404 | cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); | 404 | cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); |
405 | 405 | ||
406 | /* Put the analog decoder in standby to keep it quiet */ | ||
407 | cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL); | ||
408 | |||
406 | /* register everything */ | 409 | /* register everything */ |
407 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev); | 410 | return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev); |
408 | } | 411 | } |