iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: iio: tsl2583: check for error code from i2c_smbus_read_byte()

Browse Source 
taos_i2c_read() and taos_als_calibrate() does not check to see if the
value returned by i2c_smbus_read_byte() was an error code. This patch
adds the appropriate error handling.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Brian Masney 2016-10-28 06:00:13 -04:00 committed by Jonathan Cameron
parent a3b6b4b63b
commit 9d5f36d241
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/iio/light/tsl2583.c
View File

@ -171,7 +171,14 @@ taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len)
return ret;
}
/* read the data */
*val = i2c_smbus_read_byte(client);
ret = i2c_smbus_read_byte(client);
if (ret < 0) {
dev_err(&client->dev,
"%s failed to read byte after writing to register %x\n",
__func__, reg);
return ret;
}
*val = ret;
val++;
reg++;
}
@ -355,6 +362,13 @@ static int taos_als_calibrate(struct iio_dev *indio_dev)
}
reg_val = i2c_smbus_read_byte(chip->client);
if (reg_val < 0) {
dev_err(&chip->client->dev,
"%s failed to read after writing to the CNTRL register\n",
__func__);
return ret;
}
if ((reg_val & (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON))
!= (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON)) {
dev_err(&chip->client->dev,
@ -371,6 +385,12 @@ static int taos_als_calibrate(struct iio_dev *indio_dev)
return ret;
}
reg_val = i2c_smbus_read_byte(chip->client);
if (reg_val < 0) {
dev_err(&chip->client->dev,
"%s failed to read after writing to the STATUS register\n",
__func__);
return ret;
}
if ((reg_val & TSL258X_STA_ADC_VALID) != TSL258X_STA_ADC_VALID) {
dev_err(&chip->client->dev,