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 5/7] iio: light: tsl2583: check return values from taos_chip_{on,off}
Date: Wed, 19 Oct 2016 06:32:08 -0400 [thread overview]
Message-ID: <1476873130-24926-5-git-send-email-masneyb@onstation.org> (raw)
In-Reply-To: <1476873130-24926-1-git-send-email-masneyb@onstation.org>
The return values from taos_chip_on() and taos_chip_off() was not
checked in several places. This patch adds proper error checking to
these function calls.
Signed-off-by: Brian Masney <masneyb@onstation.org>
---
drivers/staging/iio/light/tsl2583.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index a60433e..60f0ce9 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -515,15 +515,18 @@ static ssize_t power_state_store(struct device *dev,
const char *buf, size_t len)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- int value;
+ int value, ret;
if (kstrtoint(buf, 0, &value))
return -EINVAL;
if (!value)
- taos_chip_off(indio_dev);
+ ret = taos_chip_off(indio_dev);
else
- taos_chip_on(indio_dev);
+ ret = taos_chip_on(indio_dev);
+
+ if (ret < 0)
+ return ret;
return len;
}
@@ -775,14 +778,20 @@ static ssize_t illuminance0_lux_table_store(struct device *dev,
goto luxable_store_done;
}
- if (chip->taos_chip_status == TSL258X_CHIP_WORKING)
- taos_chip_off(indio_dev);
+ if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {
+ ret = taos_chip_off(indio_dev);
+ if (ret < 0)
+ return ret;
+ }
/* Zero out the table */
memset(taos_device_lux, 0, sizeof(taos_device_lux));
memcpy(taos_device_lux, &value[1], (value[0] * 4));
- taos_chip_on(indio_dev);
+ ret = taos_chip_on(indio_dev);
+ if (ret < 0)
+ return ret;
+
ret = len;
luxable_store_done:
@@ -914,7 +923,9 @@ static int taos_probe(struct i2c_client *clientp,
taos_defaults(chip);
/* Make sure the chip is on */
- taos_chip_on(indio_dev);
+ ret = taos_chip_on(indio_dev);
+ if (ret < 0)
+ return ret;
dev_info(&clientp->dev, "Light sensor found.\n");
--
2.7.4
next prev parent reply other threads:[~2016-10-19 14:59 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 ` [PATCH 4/7] iio: light: tsl2583: return proper error code in sysfs store functions Brian Masney
2016-10-19 10:32 ` Brian Masney [this message]
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-5-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®