diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-04-01 02:52:39 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:22 -0400 |
commit | f41737ece472cd803ffb24ac9f5d6fdd1d871341 (patch) | |
tree | 26ac526ec381e26c46a857f3ce44c84e75331b01 /drivers/media/video/cx18/cx18-fileops.c | |
parent | cc26b076cf8b1040ccc514302ef9a24042272ec3 (diff) |
V4L/DVB (11370): v4l2-subdev: move s_std from tuner to core.
s_std didn't belong in the tuner ops. Stricly speaking it should be part of
the video ops, but it is used by audio and tuner devices as well, so it is
more efficient to make it part of the core ops.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 4d7d6d5a7f86..b3889c0b2697 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c | |||
@@ -608,7 +608,7 @@ int cx18_v4l2_close(struct file *filp) | |||
608 | /* Mark that the radio is no longer in use */ | 608 | /* Mark that the radio is no longer in use */ |
609 | clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags); | 609 | clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags); |
610 | /* Switch tuner to TV */ | 610 | /* Switch tuner to TV */ |
611 | cx18_call_all(cx, tuner, s_std, cx->std); | 611 | cx18_call_all(cx, core, s_std, cx->std); |
612 | /* Select correct audio input (i.e. TV tuner or Line in) */ | 612 | /* Select correct audio input (i.e. TV tuner or Line in) */ |
613 | cx18_audio_set_io(cx); | 613 | cx18_audio_set_io(cx); |
614 | if (atomic_read(&cx->ana_capturing) > 0) { | 614 | if (atomic_read(&cx->ana_capturing) > 0) { |