diff --git a/[refs] b/[refs]
index 7e19ce8a4110..109d890886e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a482f327ff56bc3cf53176a7eb736cea47291a1d
+refs/heads/master: 79a9098ae47119fad54a3443e358f08e30b7d3a5
diff --git a/trunk/drivers/media/video/gspca/sonixj.c b/trunk/drivers/media/video/gspca/sonixj.c
index 93b17340b7b1..53cb82d9e7c6 100644
--- a/trunk/drivers/media/video/gspca/sonixj.c
+++ b/trunk/drivers/media/video/gspca/sonixj.c
@@ -1350,6 +1350,9 @@ static int sd_start(struct gspca_dev *gspca_dev)
 		setbrightness(gspca_dev);
 		setcontrast(gspca_dev);
 		break;
+	case SENSOR_OV7630:
+		setvflip(sd);
+		/* fall thru */
 	default:			/* OV76xx */
 		setbrightcont(gspca_dev);
 		break;
@@ -1582,7 +1585,8 @@ static int sd_setvflip(struct gspca_dev *gspca_dev, __s32 val)
 	struct sd *sd = (struct sd *) gspca_dev;
 
 	sd->vflip = val;
-	setvflip(sd);
+	if (gspca_dev->streaming)
+		setvflip(sd);
 	return 0;
 }