diff options
| author | Erik Andrén <erik.andren@gmail.com> | 2008-11-27 17:41:55 +0100 |
|---|---|---|
| committer | Erik Andrén <erik.andren@gmail.com> | 2008-11-27 17:41:55 +0100 |
| commit | be64de249728659c3b938b711fab3847454b10eb (patch) | |
| tree | 59a17fc1d33f05ccaf32010c43263245323f3e3c /linux/drivers/media/video/gspca/m5602 | |
| parent | 78c81fef14409a4ac0fdcd42958b1eb1e85abdcb (diff) | |
| download | mediapointer-dvb-s2-be64de249728659c3b938b711fab3847454b10eb.tar.gz mediapointer-dvb-s2-be64de249728659c3b938b711fab3847454b10eb.tar.bz2 | |
Toggle read sensor sequence depending on type of sensor. Check that no more than max width of a sensor is read
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602')
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_core.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_core.c b/linux/drivers/media/video/gspca/m5602/m5602_core.c index 1d1fb541f..fd4a1b419 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_core.c +++ b/linux/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])); |