Merge branch 'master' into for-2.6.35

[mv-sheeva.git] / drivers / media / video / usbvision / usbvision-i2c.c

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index 083765238a6a5d9a34e45df6bd3a9337459b0b34..42ba2878575045dd8a00e4090a1a7615f4ab06e9 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -244,6 +244,9 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
        switch (usbvision_device_data[usbvision->DevModel].Codec) {
        case CODEC_SAA7113:
        case CODEC_SAA7111:
+               /* Without this delay the detection of the saa711x is
+                  hit-and-miss. */
+               mdelay(10);
                v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
                                &usbvision->i2c_adap, "saa7115",
                                "saa7115_auto", 0, saa711x_addrs);