aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2008-11-27 13:41:55 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 09:39:53 -0200
commitedbfbdb3bdcf9ae90ce06b92636a07c05224fe45 (patch)
tree53b1eb77e6b0199f4356da1a459ab3cd7fd4f540
parente7a7f5103bddf2491760677cdd715a865b889072 (diff)
V4L/DVB (10018): gspca - m5602 - ov9650: Use generic read_sensor function
Toggle read sensor sequence depending on type of sensor. Check that no more than max width of a sensor is read. Signed-off-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_core.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index aaba4205818..691b09a94e8 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/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]));