---

yaml --- r: 173974 b: refs/heads/master c: 8394bcf h: refs/heads/master v: v3
git-mirror · Dec 5, 2009 · cb8b25a · cb8b25a
1 parent 780dd9c
commit cb8b25a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb1f9020609ead93fcec4b0dd02511a46294c147
+refs/heads/master: 8394bcf3fc0293aa5cd07e2a1a3c6bf4e1a5b835
diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c
@@ -2248,7 +2248,7 @@ static int i2c_w(struct sd *sd, __u8 reg, __u8 value)
 
 static int i2c_r(struct sd *sd, __u8 reg)
 {
-	int ret;
+	int ret = -1;
 
 	if (sd->sensor_reg_cache[reg] != -1)
 		return sd->sensor_reg_cache[reg];

diff --git a/trunk/drivers/media/video/gspca/w996Xcf.c b/trunk/drivers/media/video/gspca/w996Xcf.c
@@ -580,7 +580,7 @@ static void w9968cf_pkt_scan(struct gspca_dev *gspca_dev,
 	/* An empty packet signals EOF */
 	if (gspca_dev->empty_packet) {
 		frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
-				data, len);
+					NULL, 0);
 		gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
 				NULL, 0);
 		gspca_dev->empty_packet = 0;