diff options
Diffstat (limited to 'drivers/media/usb/stk1160/stk1160-core.c')
-rw-r--r-- | drivers/media/usb/stk1160/stk1160-core.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-core.c b/drivers/media/usb/stk1160/stk1160-core.c index b62740846061..34a26e0cfe77 100644 --- a/drivers/media/usb/stk1160/stk1160-core.c +++ b/drivers/media/usb/stk1160/stk1160-core.c | |||
@@ -100,12 +100,21 @@ int stk1160_write_reg(struct stk1160 *dev, u16 reg, u16 value) | |||
100 | 100 | ||
101 | void stk1160_select_input(struct stk1160 *dev) | 101 | void stk1160_select_input(struct stk1160 *dev) |
102 | { | 102 | { |
103 | int route; | ||
103 | static const u8 gctrl[] = { | 104 | static const u8 gctrl[] = { |
104 | 0x98, 0x90, 0x88, 0x80 | 105 | 0x98, 0x90, 0x88, 0x80, 0x98 |
105 | }; | 106 | }; |
106 | 107 | ||
107 | if (dev->ctl_input < ARRAY_SIZE(gctrl)) | 108 | if (dev->ctl_input == STK1160_SVIDEO_INPUT) |
109 | route = SAA7115_SVIDEO3; | ||
110 | else | ||
111 | route = SAA7115_COMPOSITE0; | ||
112 | |||
113 | if (dev->ctl_input < ARRAY_SIZE(gctrl)) { | ||
114 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, | ||
115 | route, 0, 0); | ||
108 | stk1160_write_reg(dev, STK1160_GCTRL, gctrl[dev->ctl_input]); | 116 | stk1160_write_reg(dev, STK1160_GCTRL, gctrl[dev->ctl_input]); |
117 | } | ||
109 | } | 118 | } |
110 | 119 | ||
111 | /* TODO: We should break this into pieces */ | 120 | /* TODO: We should break this into pieces */ |
@@ -351,8 +360,6 @@ static int stk1160_probe(struct usb_interface *interface, | |||
351 | 360 | ||
352 | /* i2c reset saa711x */ | 361 | /* i2c reset saa711x */ |
353 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0); | 362 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, reset, 0); |
354 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_routing, | ||
355 | 0, 0, 0); | ||
356 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0); | 363 | v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0); |
357 | 364 | ||
358 | /* reset stk1160 to default values */ | 365 | /* reset stk1160 to default values */ |