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/ivtv/ivtv-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/ivtv/ivtv-fileops.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-fileops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c index cfaacf6096d0..e212337c6513 100644 --- a/drivers/media/video/ivtv/ivtv-fileops.c +++ b/drivers/media/video/ivtv/ivtv-fileops.c | |||
@@ -857,7 +857,7 @@ int ivtv_v4l2_close(struct file *filp) | |||
857 | /* Mark that the radio is no longer in use */ | 857 | /* Mark that the radio is no longer in use */ |
858 | clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags); | 858 | clear_bit(IVTV_F_I_RADIO_USER, &itv->i_flags); |
859 | /* Switch tuner to TV */ | 859 | /* Switch tuner to TV */ |
860 | ivtv_call_all(itv, tuner, s_std, itv->std); | 860 | ivtv_call_all(itv, core, s_std, itv->std); |
861 | /* Select correct audio input (i.e. TV tuner or Line in) */ | 861 | /* Select correct audio input (i.e. TV tuner or Line in) */ |
862 | ivtv_audio_set_io(itv); | 862 | ivtv_audio_set_io(itv); |
863 | if (itv->hw_flags & IVTV_HW_SAA711X) | 863 | if (itv->hw_flags & IVTV_HW_SAA711X) |