---

yaml --- r: 226228 b: refs/heads/master c: d65174c h: refs/heads/master v: v3
git-mirror · Dec 29, 2010 · f39bace · f39bace
1 parent f507b9d
commit f39bace
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14653e64e9db48e91cbd00fba335a6a459e66cc9
+refs/heads/master: d65174c06f2bf4ff73d1c71960be317b89561c06
diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c
@@ -3937,6 +3937,8 @@ static void sd_stop0(struct gspca_dev *gspca_dev)
 {
 	struct sd *sd = (struct sd *) gspca_dev;
 
+	if (!sd->gspca_dev.present)
+		return;
 	if (sd->bridge == BRIDGE_W9968CF)
 		w9968cf_stop0(sd);
 

diff --git a/trunk/drivers/media/video/gspca/w996Xcf.c b/trunk/drivers/media/video/gspca/w996Xcf.c
@@ -549,10 +549,8 @@ static int w9968cf_mode_init_regs(struct sd *sd)
 
 static void w9968cf_stop0(struct sd *sd)
 {
-	if (sd->gspca_dev.present) {
-		reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */
-		reg_w(sd, 0x16, 0x0000); /* stop video capture */
-	}
+	reg_w(sd, 0x39, 0x0000); /* disable JPEG encoder */
+	reg_w(sd, 0x16, 0x0000); /* stop video capture */
 }
 
 /* The w9968cf docs say that a 0 sized packet means EOF (and also SOF