From 598f2f2b644d8b0ff88d3dbe821628e541c00400 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Andr=C3=A9n?= Date: Wed, 19 Nov 2008 17:58:55 -0300 Subject: [PATCH] --- yaml --- r: 124478 b: refs/heads/master c: 84833a3f4e22907379462e8a7c18970db70d21d8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1046c26245c7..d8a148e4bee9 100644 --- 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 index 2cb76d0f789c..a98d5335f79c 100644 --- 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 "