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