Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / drivers / media / video / gspca / ov534_9.c

diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index e6601b8860322fe6d1c0eb31b75d58bb23cf6cc0..1fd41f0d2e9514a408db394e9a613bc4ee2badd7 100644 (file)
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1008,6 +1008,7 @@ static int sccb_check_status(struct gspca_dev *gspca_dev)
        int i;
 
        for (i = 0; i < 5; i++) {
+               msleep(10);
                data = reg_r(gspca_dev, OV534_REG_STATUS);
 
                switch (data) {
@@ -1376,7 +1377,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
                                ARRAY_SIZE(ov562x_init_2));
                reg_w(gspca_dev, 0xe0, 0x00);
        } else {
-               err("Unknown sensor %04x", sensor_id);
+               pr_err("Unknown sensor %04x", sensor_id);
                return -EINVAL;
        }