diff options
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index a0feb1c9773..8bc03b9e131 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -2597,7 +2597,6 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel) | |||
2597 | /* inputs #1 and #2 are variable for SAA7111 and SAA7113 */ | 2597 | /* inputs #1 and #2 are variable for SAA7111 and SAA7113 */ |
2598 | int mode[4]= {SAA7115_COMPOSITE0, 0, 0, SAA7115_COMPOSITE3}; | 2598 | int mode[4]= {SAA7115_COMPOSITE0, 0, 0, SAA7115_COMPOSITE3}; |
2599 | int audio[]= {1, 0, 0, 0}; | 2599 | int audio[]= {1, 0, 0, 0}; |
2600 | struct v4l2_routing route; | ||
2601 | //channel 0 is TV with audiochannel 1 (tuner mono) | 2600 | //channel 0 is TV with audiochannel 1 (tuner mono) |
2602 | //channel 1 is Composite with audio channel 0 (line in) | 2601 | //channel 1 is Composite with audio channel 0 (line in) |
2603 | //channel 2 is S-Video with audio channel 0 (line in) | 2602 | //channel 2 is S-Video with audio channel 0 (line in) |
@@ -2630,9 +2629,7 @@ int usbvision_muxsel(struct usb_usbvision *usbvision, int channel) | |||
2630 | mode[2] = SAA7115_SVIDEO1; | 2629 | mode[2] = SAA7115_SVIDEO1; |
2631 | break; | 2630 | break; |
2632 | } | 2631 | } |
2633 | route.input = mode[channel]; | 2632 | call_all(usbvision, video, s_routing, mode[channel], 0, 0); |
2634 | route.output = 0; | ||
2635 | call_all(usbvision, video, s_routing, &route); | ||
2636 | usbvision_set_audio(usbvision, audio[channel]); | 2633 | usbvision_set_audio(usbvision, audio[channel]); |
2637 | return 0; | 2634 | return 0; |
2638 | } | 2635 | } |