Commit acf9ead8 authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron

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: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent b475f80b
...@@ -501,16 +501,27 @@ static ssize_t in_illuminance_calibrate_store(struct device *dev, ...@@ -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 iio_dev *indio_dev = dev_to_iio_dev(dev);
struct tsl2583_chip *chip = iio_priv(indio_dev); struct tsl2583_chip *chip = iio_priv(indio_dev);
int value; int value, ret;
if (kstrtoint(buf, 0, &value) || value != 1) if (kstrtoint(buf, 0, &value) || value != 1)
return -EINVAL; return -EINVAL;
mutex_lock(&chip->als_mutex); 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); mutex_unlock(&chip->als_mutex);
return len; return ret;
} }
static ssize_t in_illuminance_lux_table_show(struct device *dev, static ssize_t in_illuminance_lux_table_show(struct device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment