---

yaml --- r: 124478 b: refs/heads/master c: 84833a3 h: refs/heads/master v: v3
git-mirror · Dec 30, 2008 · 598f2f2 · 598f2f2
1 parent b57f872
commit 598f2f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88a40cfbf25d82758237250a04d9bed51266215c
+refs/heads/master: 84833a3f4e22907379462e8a7c18970db70d21d8
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -147,7 +147,7 @@ int s5k4aa_read_sensor(struct sd *sd, const u8 address,
 	if (err < 0)
 		goto out;
 
-	for (i = 0; (i < len) & !err; i++) {
+	for (i = 0; (i < len) && !err; i++) {
 		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
 
 		PDEBUG(D_CONF, "Reading sensor register "