diff options
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-i2c.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-i2c.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index dd2f8f27c73..83778267175 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c | |||
@@ -247,7 +247,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision) | |||
247 | switch (usbvision_device_data[usbvision->DevModel].Codec) { | 247 | switch (usbvision_device_data[usbvision->DevModel].Codec) { |
248 | case CODEC_SAA7113: | 248 | case CODEC_SAA7113: |
249 | case CODEC_SAA7111: | 249 | case CODEC_SAA7111: |
250 | v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "saa7115", | 250 | v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev, |
251 | &usbvision->i2c_adap, "saa7115", | ||
251 | "saa7115_auto", saa711x_addrs); | 252 | "saa7115_auto", saa711x_addrs); |
252 | break; | 253 | break; |
253 | } | 254 | } |
@@ -256,13 +257,15 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision) | |||
256 | enum v4l2_i2c_tuner_type type; | 257 | enum v4l2_i2c_tuner_type type; |
257 | struct tuner_setup tun_setup; | 258 | struct tuner_setup tun_setup; |
258 | 259 | ||
259 | sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner", | 260 | sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev, |
261 | &usbvision->i2c_adap, "tuner", | ||
260 | "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD)); | 262 | "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD)); |
261 | /* depending on whether we found a demod or not, select | 263 | /* depending on whether we found a demod or not, select |
262 | the tuner type. */ | 264 | the tuner type. */ |
263 | type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV; | 265 | type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV; |
264 | 266 | ||
265 | sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner", | 267 | sd = v4l2_i2c_new_probed_subdev(&usbvision->v4l2_dev, |
268 | &usbvision->i2c_adap, "tuner", | ||
266 | "tuner", v4l2_i2c_tuner_addrs(type)); | 269 | "tuner", v4l2_i2c_tuner_addrs(type)); |
267 | 270 | ||
268 | if (usbvision->tuner_type != -1) { | 271 | if (usbvision->tuner_type != -1) { |