[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1478177780-28699-9-git-send-email-masneyb@onstation.org>
Date: Thu, 3 Nov 2016 08:56:19 -0400
From: Brian Masney <masneyb@...tation.org>
To: jic23@...nel.org, linux-iio@...r.kernel.org
Cc: devel@...verdev.osuosl.org, gregkh@...uxfoundation.org,
lars@...afoo.de, pmeerw@...erw.net, knaack.h@....de,
linux-kernel@...r.kernel.org, Jon.Brenner@....com
Subject: [PATCH 8/9] staging: iio: tsl2583: check if chip is suspended in in_illuminance_calibrate_store
in_illuminance_calibrate_store() did not check to see if the chip is
suspended. 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@...tation.org>
---
drivers/staging/iio/light/tsl2583.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 1ff90b3..8c8361d 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -473,16 +473,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->suspended) {
+ 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,
--
2.5.5
Powered by blists - more mailing lists