linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org, linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
	lars@metafoo.de, pmeerw@pmeerw.net, knaack.h@gmx.de,
	linux-kernel@vger.kernel.org, Jon.Brenner@ams.com
Subject: [PATCH v2 03/23] staging: iio: tsl2583: check if chip is suspended in in_illuminance_calibrate_store
Date: Tue,  8 Nov 2016 05:16:28 -0500	[thread overview]
Message-ID: <1478600208-21153-4-git-send-email-masneyb@onstation.org> (raw)
In-Reply-To: <1478600208-21153-1-git-send-email-masneyb@onstation.org>

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@onstation.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 cf5fd5f..6c46253 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->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.7.4

  parent reply	other threads:[~2016-11-08 10:18 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-08 10:16 [PATCH v2 00/23] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-08 10:16 ` [PATCH v2 01/23] staging: iio: tsl2583: split out functionality of taos_chip_on() Brian Masney
2016-11-08 10:16 ` [PATCH v2 02/23] staging: iio: tsl2583: fix issue with changes to calibscale and int_time not being set on the chip Brian Masney
2016-11-08 10:16 ` Brian Masney [this message]
2016-11-08 10:16 ` [PATCH v2 04/23] staging: iio: tsl2583: remove unnecessary chip status check in taos_get_lux Brian Masney
2016-11-08 10:16 ` [PATCH v2 05/23] staging: iio: tsl2583: remove unnecessary chip status checks in suspend/resume Brian Masney
2016-11-08 10:16 ` [PATCH v2 06/23] staging: iio: tsl2583: change current chip state from a tristate to a bool Brian Masney
2016-11-08 10:16 ` [PATCH v2 07/23] staging: iio: tsl2583: remove redundant write to the control register in taos_probe() Brian Masney
2016-11-08 10:16 ` [PATCH v2 08/23] staging: iio: tsl2583: remove the FSF's mailing address Brian Masney
2016-11-08 10:16 ` [PATCH v2 09/23] staging: iio: tsl2583: cleaned up logging Brian Masney
2016-11-08 10:29   ` Joe Perches
2016-11-08 15:58     ` Brian Masney
2016-11-08 10:16 ` [PATCH v2 10/23] staging: iio: tsl2583: unify function and variable prefix to tsl2583_ Brian Masney
2016-11-08 10:16 ` [PATCH v2 11/23] staging: iio: tsl2583: fix alignment of #define values Brian Masney
2016-11-08 10:16 ` [PATCH v2 12/23] staging: iio: tsl2583: fix comparison between signed and unsigned integers Brian Masney
2016-11-08 10:16 ` [PATCH v2 13/23] staging: iio: tsl2583: change newlines to improve readability Brian Masney
2016-11-08 10:16 ` [PATCH v2 14/23] staging: iio: tsl2583: combine sysfs documentation Brian Masney
2016-11-08 10:16 ` [PATCH v2 15/23] staging: iio: tsl2583: fix multiline comment syntax Brian Masney
2016-11-08 10:16 ` [PATCH v2 16/23] staging: iio: tsl2583: updated code comment to match what the code does Brian Masney
2016-11-08 10:16 ` [PATCH v2 17/23] staging: iio: tsl2583: moved code block inside else statement Brian Masney
2016-11-08 10:16 ` [PATCH v2 18/23] staging: iio: tsl2583: change tsl2583_als_calibrate() to return 0 on success Brian Masney
2016-11-08 10:16 ` [PATCH v2 19/23] staging: iio: tsl2583: remove unnecessary parentheses Brian Masney
2016-11-08 10:16 ` [PATCH v2 20/23] staging: iio: tsl2583: don't assume an unsigned int is 32 bits Brian Masney
2016-11-08 10:16 ` [PATCH v2 21/23] staging: iio: tsl2583: move from a global to a per device lux table Brian Masney
2016-11-08 10:16 ` [PATCH v2 22/23] staging: iio: tsl2583: updated copyright and MODULE_AUTHOR Brian Masney
2016-11-08 20:35   ` Jonathan Cameron
2016-11-08 10:16 ` [PATCH v2 23/23] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-08 20:50   ` Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478600208-21153-4-git-send-email-masneyb@onstation.org \
    --to=masneyb@onstation.org \
    --cc=Jon.Brenner@ams.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).