mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Brian Masney <masneyb@onstation.org>
To: jic23@kernel.org
Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net,
	gregkh@linuxfoundation.org, linux-iio@vger.kernel.org,
	devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/7] iio: light: tsl2583: return proper error code in sysfs store functions
Date: Wed, 19 Oct 2016 06:32:07 -0400	[thread overview]
Message-ID: <1476873130-24926-4-git-send-email-masneyb@onstation.org> (raw)
In-Reply-To: <1476873130-24926-1-git-send-email-masneyb@onstation.org>

illuminance0_calibbias_store(), illuminance0_input_target_store(), and
illuminance0_calibrate_store() did not return an error code when
an invalid value was passed in. The input was checked to see if the
input was valid, however the caller would not be notified that an
invalid value was passed in. This patch changes these three functions to
return -EINVAL when invalid input is passed in.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/tsl2583.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index bbb8fc3..a60433e 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -657,9 +657,10 @@ static ssize_t illuminance0_calibbias_store(struct device *dev,
 
 	if (kstrtoint(buf, 0, &value))
 		return -EINVAL;
+	else if (!value)
+		return -EINVAL;
 
-	if (value)
-		chip->taos_settings.als_gain_trim = value;
+	chip->taos_settings.als_gain_trim = value;
 
 	return len;
 }
@@ -684,9 +685,10 @@ static ssize_t illuminance0_input_target_store(struct device *dev,
 
 	if (kstrtoint(buf, 0, &value))
 		return -EINVAL;
+	else if (!value)
+		return -EINVAL;
 
-	if (value)
-		chip->taos_settings.als_cal_target = value;
+	chip->taos_settings.als_cal_target = value;
 
 	return len;
 }
@@ -713,9 +715,10 @@ static ssize_t illuminance0_calibrate_store(struct device *dev,
 
 	if (kstrtoint(buf, 0, &value))
 		return -EINVAL;
+	else if (value != 1)
+		return -EINVAL;
 
-	if (value == 1)
-		taos_als_calibrate(indio_dev);
+	taos_als_calibrate(indio_dev);
 
 	return len;
 }
-- 
2.7.4

  parent reply	other threads:[~2016-10-19 14:49 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-19 10:32 [PATCH 1/7] iio: light: tsl2583: return proper error code Brian Masney
2016-10-19 10:32 ` [PATCH 2/7] iio: light: tsl2583: change functions to only have a single exit point Brian Masney
2016-10-19 11:08   ` Dan Carpenter
2016-10-19 12:38     ` Brian Masney
2016-10-19 12:51       ` Dan Carpenter
2016-10-19 10:32 ` [PATCH 3/7] iio: light: tsl2583: use DEVICE_ATTR_{RO, RW, WO} macros Brian Masney
2016-10-19 10:47   ` Peter Meerwald-Stadler
2016-10-19 13:04     ` Brian Masney
2016-10-19 11:26   ` Dan Carpenter
2016-10-19 13:08     ` Brian Masney
2016-10-19 13:11       ` Dan Carpenter
2016-10-22 17:25         ` Jonathan Cameron
2016-10-19 16:30   ` Jonathan Cameron
2016-10-19 10:32 ` Brian Masney [this message]
2016-10-19 10:32 ` [PATCH 5/7] iio: light: tsl2583: check return values from taos_chip_{on,off} Brian Masney
2016-10-19 11:22   ` [PATCH 5/7] iio: light: tsl2583: check return values from taos_chip_{on, off} Dan Carpenter
2016-10-19 12:48     ` Brian Masney
2016-10-19 12:54       ` Dan Carpenter
2016-10-19 12:57         ` Dan Carpenter
2016-10-19 10:32 ` [PATCH 6/7] iio: light: tsl2583: add locking to sysfs *_store() functions Brian Masney
2016-10-19 11:33   ` Dan Carpenter
2016-10-19 11:37     ` Dan Carpenter
2016-10-22 17:29       ` Jonathan Cameron
2016-10-24  9:35         ` Dan Carpenter
2016-10-19 10:32 ` [PATCH 7/7] iio: light: tsl2583: fix concurrency issue in taos_get_lux() Brian Masney
2016-10-22 17:32   ` Jonathan Cameron
2016-10-22 17:18 ` [PATCH 1/7] iio: light: tsl2583: return proper error code 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=1476873130-24926-4-git-send-email-masneyb@onstation.org \
    --to=masneyb@onstation.org \
    --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

all inboxes | Powered by JetHome®