Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d5f36d2 authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files

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



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: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent a3b6b4b6

drivers/staging/iio/light/tsl2583.c

+21 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,14 @@ taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len) 
			return ret;

			return ret;

		}

		}

		/* read the data */

		/* 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++;

		val++;

		reg++;

		reg++;

	}

	}
@@ -355,6 +362,13 @@ static int taos_als_calibrate(struct iio_dev *indio_dev) 
	}

	}





	reg_val = i2c_smbus_read_byte(chip->client);

	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))

	if ((reg_val & (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON))

			!= (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON)) {

			!= (TSL258X_CNTL_ADC_ENBL | TSL258X_CNTL_PWR_ON)) {

		dev_err(&chip->client->dev,

		dev_err(&chip->client->dev,
@@ -371,6 +385,12 @@ static int taos_als_calibrate(struct iio_dev *indio_dev) 
		return ret;

		return ret;

	}

	}

	reg_val = i2c_smbus_read_byte(chip->client);

	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) {

	if ((reg_val & TSL258X_STA_ADC_VALID) != TSL258X_STA_ADC_VALID) {

		dev_err(&chip->client->dev,

		dev_err(&chip->client->dev,