diff options
| author |  Brian Masney <masneyb@onstation.org>
| 2016-11-12 13:19:16 -0500 |
|---|---|---|
| committer |  Jonathan Cameron <jic23@kernel.org>
| 2016-11-13 13:07:17 +0000 |
| commit | acf9ead8fa2ef7a41762c024ae4b4ac8ecb71ee8 (patch) | |
| tree | e884af2bbb236ed5220d634d60fc6a5e93de1cc4 /drivers/staging/iio | |
| parent | iio: envelope-detector: ADC driver based on a DAC and a comparator (diff) | |
| download | linux-acf9ead8fa2ef7a41762c024ae4b4ac8ecb71ee8.tar.gz linux-acf9ead8fa2ef7a41762c024ae4b4ac8ecb71ee8.tar.bz2 linux-acf9ead8fa2ef7a41762c024ae4b4ac8ecb71ee8.zip | |
staging: iio: tsl2583: check if chip is in a working state in in_illuminance_calibrate_store
in_illuminance_calibrate_store() did not check to see if the chip is
in a working state. This patch adds the proper check. The return value
from taos_als_calibrate() was also not checked in this function, so the
proper check was also added while changes are being made here.
Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio')
| -rw-r--r-- | drivers/staging/iio/light/tsl2583.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c index 1a7be120ba25..de54e7429672 100644 --- a/drivers/staging/iio/light/tsl2583.c +++ b/drivers/staging/iio/light/tsl2583.c @@ -501,16 +501,27 @@ static ssize_t in_illuminance_calibrate_store(struct device *dev, { struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct tsl2583_chip *chip = iio_priv(indio_dev); - int value; + int value, ret; if (kstrtoint(buf, 0, &value) || value != 1) return -EINVAL; mutex_lock(&chip->als_mutex); - taos_als_calibrate(indio_dev); + + if (chip->taos_chip_status != TSL258X_CHIP_WORKING) { + ret = -EBUSY; + goto done; + } + + ret = taos_als_calibrate(indio_dev); + if (ret < 0) + goto done; + + ret = len; +done: mutex_unlock(&chip->als_mutex); - return len; + return ret; } static ssize_t in_illuminance_lux_table_show(struct device *dev, |