---

yaml --- r: 124494 b: refs/heads/master c: edbfbdb h: refs/heads/master v: v3
git-mirror · Dec 30, 2008 · 9ae295c · 9ae295c
1 parent 2699864
commit 9ae295c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7a7f5103bddf2491760677cdd715a865b889072
+refs/heads/master: edbfbdb3bdcf9ae90ce06b92636a07c05224fe45
diff --git a/trunk/drivers/media/video/gspca/m5602/m5602_core.c b/trunk/drivers/media/video/gspca/m5602/m5602_core.c
@@ -85,9 +85,14 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
 {
 	int err, i;
 
+	if (!len || len > sd->sensor->i2c_regW)
+		return -EINVAL;
+
 	do {
 		err = m5602_read_bridge(sd, M5602_XB_I2C_STATUS, i2c_data);
 	} while ((*i2c_data & I2C_BUSY) && !err);
+	if (err < 0)
+		goto out;
 
 	err = m5602_write_bridge(sd, M5602_XB_I2C_DEV_ADDR,
 				 sd->sensor->i2c_slave_id);
@@ -98,13 +103,19 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
 	if (err < 0)
 		goto out;
 
-	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x10 + len);
-	if (err < 0)
-		goto out;
+	if (sd->sensor->i2c_regW == 1) {
+		err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, len);
+		if (err < 0)
+			goto out;
 
-	err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
-	if (err < 0)
-		goto out;
+		err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x08);
+		if (err < 0)
+			goto out;
+	} else {
+		err = m5602_write_bridge(sd, M5602_XB_I2C_CTRL, 0x18 + len);
+		if (err < 0)
+			goto out;
+	}
 
 	for (i = 0; (i < len) && !err; i++) {
 		err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));