diff options
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-ioctl.c')
-rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 052fbe9cde86..cf48b6ab97cb 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c | |||
@@ -1033,7 +1033,6 @@ static int ivtv_g_output(struct file *file, void *fh, unsigned int *i) | |||
1033 | static int ivtv_s_output(struct file *file, void *fh, unsigned int outp) | 1033 | static int ivtv_s_output(struct file *file, void *fh, unsigned int outp) |
1034 | { | 1034 | { |
1035 | struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; | 1035 | struct ivtv *itv = ((struct ivtv_open_id *)fh)->itv; |
1036 | struct v4l2_routing route; | ||
1037 | 1036 | ||
1038 | if (outp >= itv->card->nof_outputs) | 1037 | if (outp >= itv->card->nof_outputs) |
1039 | return -EINVAL; | 1038 | return -EINVAL; |
@@ -1046,9 +1045,9 @@ static int ivtv_s_output(struct file *file, void *fh, unsigned int outp) | |||
1046 | itv->active_output, outp); | 1045 | itv->active_output, outp); |
1047 | 1046 | ||
1048 | itv->active_output = outp; | 1047 | itv->active_output = outp; |
1049 | route.input = SAA7127_INPUT_TYPE_NORMAL; | 1048 | ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing, |
1050 | route.output = itv->card->video_outputs[outp].video_output; | 1049 | SAA7127_INPUT_TYPE_NORMAL, |
1051 | ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_routing, &route); | 1050 | itv->card->video_outputs[outp].video_output, 0); |
1052 | 1051 | ||
1053 | return 0; | 1052 | return 0; |
1054 | } | 1053 | } |
@@ -1738,7 +1737,8 @@ static long ivtv_default(struct file *file, void *fh, int cmd, void *arg) | |||
1738 | case VIDIOC_INT_S_AUDIO_ROUTING: { | 1737 | case VIDIOC_INT_S_AUDIO_ROUTING: { |
1739 | struct v4l2_routing *route = arg; | 1738 | struct v4l2_routing *route = arg; |
1740 | 1739 | ||
1741 | ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, route); | 1740 | ivtv_call_hw(itv, itv->card->hw_audio, audio, s_routing, |
1741 | route->input, route->output, 0); | ||
1742 | break; | 1742 | break; |
1743 | } | 1743 | } |
1744 | 1744 | ||