diff --git a/[refs] b/[refs]
index 69ff90c2ec00..51bc7fbd3ee1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c9f5bd7cb8a74965e7a19eead5d77c35bf30db7
+refs/heads/master: 04881127340c43fc5b8dbc2c381c1928ee22559e
diff --git a/trunk/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c b/trunk/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
index 748e1421d6d8..cbb153180d59 100644
--- a/trunk/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
+++ b/trunk/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
@@ -52,9 +52,13 @@ static int vv6410_s_ctrl(struct v4l2_ctrl *ctrl)
 
 	switch (ctrl->id) {
 	case V4L2_CID_HFLIP:
+		if (!gspca_dev->streaming)
+			return 0;
 		err = vv6410_set_hflip(gspca_dev, ctrl->val);
 		break;
 	case V4L2_CID_VFLIP:
+		if (!gspca_dev->streaming)
+			return 0;
 		err = vv6410_set_vflip(gspca_dev, ctrl->val);
 		break;
 	case V4L2_CID_GAIN: