diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:49:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:20 -0400 |
commit | 7c9fc9d50f97c9a6733ff1a22b6e31bcd91778e2 (patch) | |
tree | 12423e911ab794b85f5f2b1148ce5fe8a07103bf /drivers/media/video/cx23885 | |
parent | 78a3b4db2e53a1903c86e2856e175d85a3849e84 (diff) |
V4L/DVB (11368): v4l2-subdev: move s_standby from core to tuner.
s_standby is only used to put the tuner in powersaving mode, so move it
from core to tuner.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-core.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index dc7fff22cfdd..beda42925ce7 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c | |||
@@ -875,7 +875,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) | |||
875 | cx23885_i2c_register(&dev->i2c_bus[1]); | 875 | cx23885_i2c_register(&dev->i2c_bus[1]); |
876 | cx23885_i2c_register(&dev->i2c_bus[2]); | 876 | cx23885_i2c_register(&dev->i2c_bus[2]); |
877 | cx23885_card_setup(dev); | 877 | cx23885_card_setup(dev); |
878 | call_all(dev, core, s_standby, 0); | 878 | call_all(dev, tuner, s_standby); |
879 | cx23885_ir_init(dev); | 879 | cx23885_ir_init(dev); |
880 | 880 | ||
881 | if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) { | 881 | if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) { |
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index d43c74396767..f48454ab3900 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -673,7 +673,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
673 | fe0->dvb.frontend->callback = cx23885_tuner_callback; | 673 | fe0->dvb.frontend->callback = cx23885_tuner_callback; |
674 | 674 | ||
675 | /* Put the analog decoder in standby to keep it quiet */ | 675 | /* Put the analog decoder in standby to keep it quiet */ |
676 | call_all(dev, core, s_standby, 0); | 676 | call_all(dev, tuner, s_standby); |
677 | 677 | ||
678 | if (fe0->dvb.frontend->ops.analog_ops.standby) | 678 | if (fe0->dvb.frontend->ops.analog_ops.standby) |
679 | fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend); | 679 | fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend); |