| Message ID | 20180304014942.18727-10-masneyb@onstation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 3 Mar 2018 20:49:39 -0500 Brian Masney <masneyb@onstation.org> wrote: > The functions in_illuminance0_calibrate_store() and > in_illuminance0_lux_table_store() did not have complete error handling > in place. This patch adds the missing error handling. > > Signed-off-by: Brian Masney <masneyb@onstation.org> Applied. Thanks, > --- > drivers/staging/iio/light/tsl2x7x.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c > index 8adc6db44790..da7a4e025083 100644 > --- a/drivers/staging/iio/light/tsl2x7x.c > +++ b/drivers/staging/iio/light/tsl2x7x.c > @@ -940,8 +940,11 @@ static ssize_t in_illuminance0_calibrate_store(struct device *dev, > if (strtobool(buf, &value)) > return -EINVAL; > > - if (value) > - tsl2x7x_als_calibrate(indio_dev); > + if (value) { > + ret = tsl2x7x_als_calibrate(indio_dev); > + if (ret < 0) > + return ret; > + } > > ret = tsl2x7x_invoke_change(indio_dev); > if (ret < 0) > @@ -1006,8 +1009,11 @@ static ssize_t in_illuminance0_lux_table_store(struct device *dev, > return -EINVAL; > } > > - if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) > - tsl2x7x_chip_off(indio_dev); > + if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) { > + ret = tsl2x7x_chip_off(indio_dev); > + if (ret < 0) > + return ret; > + } > > /* Zero out the table */ > memset(chip->tsl2x7x_device_lux, 0, sizeof(chip->tsl2x7x_device_lux)); -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 8adc6db44790..da7a4e025083 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -940,8 +940,11 @@ static ssize_t in_illuminance0_calibrate_store(struct device *dev, if (strtobool(buf, &value)) return -EINVAL; - if (value) - tsl2x7x_als_calibrate(indio_dev); + if (value) { + ret = tsl2x7x_als_calibrate(indio_dev); + if (ret < 0) + return ret; + } ret = tsl2x7x_invoke_change(indio_dev); if (ret < 0) @@ -1006,8 +1009,11 @@ static ssize_t in_illuminance0_lux_table_store(struct device *dev, return -EINVAL; } - if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) - tsl2x7x_chip_off(indio_dev); + if (chip->tsl2x7x_chip_status == TSL2X7X_CHIP_WORKING) { + ret = tsl2x7x_chip_off(indio_dev); + if (ret < 0) + return ret; + } /* Zero out the table */ memset(chip->tsl2x7x_device_lux, 0, sizeof(chip->tsl2x7x_device_lux));
The functions in_illuminance0_calibrate_store() and in_illuminance0_lux_table_store() did not have complete error handling in place. This patch adds the missing error handling. Signed-off-by: Brian Masney <masneyb@onstation.org> --- drivers/staging/iio/light/tsl2x7x.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)