diff --git a/[refs] b/[refs]
index b1b31add11e2..43eff7e28be9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9336960d075839b41bef89a0c68899c4025e8289
+refs/heads/master: ab269d300ef9fe7e2f60613d0ac160e12b84658e
diff --git a/trunk/drivers/media/video/gspca/stv0680.c b/trunk/drivers/media/video/gspca/stv0680.c
index 856675e00e2d..7312bf43113b 100644
--- a/trunk/drivers/media/video/gspca/stv0680.c
+++ b/trunk/drivers/media/video/gspca/stv0680.c
@@ -138,6 +138,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
 	struct sd *sd = (struct sd *) gspca_dev;
 	struct cam *cam = &gspca_dev->cam;
 
+	/* Give the camera some time to settle, otherwise initalization will
+	   fail on hotplug, and yes it really needs a full second. */
+	msleep(1000);
+
 	/* ping camera to be sure STV0680 is present */
 	if (stv_sndctrl(gspca_dev, 0, 0x88, 0x5678, 0x02) != 0x02 ||
 	    gspca_dev->usb_buf[0] != 0x56 || gspca_dev->usb_buf[1] != 0x78) {