aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-04-01 02:52:39 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:22 -0400
commitf41737ece472cd803ffb24ac9f5d6fdd1d871341 (patch)
tree26ac526ec381e26c46a857f3ce44c84e75331b01 /drivers/media/video/vino.c
parentcc26b076cf8b1040ccc514302ef9a24042272ec3 (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/vino.c')
-rw-r--r--drivers/media/video/vino.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 8da4dd1e0e94..c39a2d4d5178 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -2589,7 +2589,7 @@ static int vino_acquire_input(struct vino_channel_settings *vcs)
2589 } 2589 }
2590 if (data_norm == 3) 2590 if (data_norm == 3)
2591 data_norm = VINO_DATA_NORM_PAL; 2591 data_norm = VINO_DATA_NORM_PAL;
2592 ret = decoder_call(tuner, s_std, norm); 2592 ret = decoder_call(core, s_std, norm);
2593 } 2593 }
2594 2594
2595 spin_lock_irqsave(&vino_drvdata->input_lock, flags); 2595 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2679,7 +2679,7 @@ static int vino_set_input(struct vino_channel_settings *vcs, int input)
2679 } 2679 }
2680 if (data_norm == 3) 2680 if (data_norm == 3)
2681 data_norm = VINO_DATA_NORM_PAL; 2681 data_norm = VINO_DATA_NORM_PAL;
2682 ret = decoder_call(tuner, s_std, norm); 2682 ret = decoder_call(core, s_std, norm);
2683 } 2683 }
2684 2684
2685 spin_lock_irqsave(&vino_drvdata->input_lock, flags); 2685 spin_lock_irqsave(&vino_drvdata->input_lock, flags);
@@ -2813,7 +2813,7 @@ static int vino_set_data_norm(struct vino_channel_settings *vcs,
2813 * as it may take a while... */ 2813 * as it may take a while... */
2814 2814
2815 norm = vino_data_norms[data_norm].std; 2815 norm = vino_data_norms[data_norm].std;
2816 err = decoder_call(tuner, s_std, norm); 2816 err = decoder_call(core, s_std, norm);
2817 2817
2818 spin_lock_irqsave(&vino_drvdata->input_lock, *flags); 2818 spin_lock_irqsave(&vino_drvdata->input_lock, *flags);
2819 2819