From: Jonathan Cameron <jic23@kernel.org>
To: Brian Masney <masneyb@onstation.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: Re: [PATCH v3 03/28] staging: iio: tsl2583: check if chip is suspended in in_illuminance_calibrate_store
Date: Sat, 12 Nov 2016 16:27:32 +0000 [thread overview]
Message-ID: <b30b4883-07ff-b2aa-7034-e9713e1dfca2@kernel.org> (raw)
In-Reply-To: <36ad2571-c49d-09ca-fbc7-23a13fa15056@kernel.org>
On 12/11/16 16:24, Jonathan Cameron wrote:
> On 10/11/16 09:25, Brian Masney wrote:
>> 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>
> Applied.
And backed out. It doesn't build :(
drivers/staging/iio/light/tsl2583.c:511:10: error: ‘struct tsl2583_chip’ has no member named ‘suspended’
if (chip->suspended) {
^~
>> ---
>> 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 1a7be12..eb59ea0 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,
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2016-11-12 16:28 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 9:25 [PATCH v3 00/28] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-10 9:25 ` [PATCH v3 01/28] staging: iio: tsl2583: split out functionality of taos_chip_on() Brian Masney
2016-11-12 16:17 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 02/28] staging: iio: tsl2583: fix issue with changes to calibscale and int_time not being set on the chip Brian Masney
2016-11-12 16:23 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 03/28] staging: iio: tsl2583: check if chip is suspended in in_illuminance_calibrate_store Brian Masney
2016-11-12 16:24 ` Jonathan Cameron
2016-11-12 16:27 ` Jonathan Cameron [this message]
2016-11-12 16:37 ` Brian Masney
2016-11-10 9:25 ` [PATCH v3 04/28] staging: iio: tsl2583: remove unnecessary chip status check in taos_get_lux Brian Masney
2016-11-12 16:28 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 05/28] staging: iio: tsl2583: remove unnecessary chip status checks in suspend/resume Brian Masney
2016-11-12 16:31 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 06/28] staging: iio: tsl2583: change current chip state from a tristate to a bool Brian Masney
2016-11-10 9:25 ` [PATCH v3 07/28] staging: iio: tsl2583: remove redundant write to the control register in taos_probe() Brian Masney
2016-11-10 9:25 ` [PATCH v3 08/28] staging: iio: tsl2583: remove the FSF's mailing address Brian Masney
2016-11-10 9:25 ` [PATCH v3 09/28] staging: iio: tsl2583: cleaned up logging Brian Masney
2016-11-10 9:25 ` [PATCH v3 10/28] staging: iio: tsl2583: unify function and variable prefix to tsl2583_ Brian Masney
2016-11-10 9:25 ` [PATCH v3 11/28] staging: iio: tsl2583: fix alignment of #define values Brian Masney
2016-11-10 9:25 ` [PATCH v3 12/28] staging: iio: tsl2583: fix comparison between signed and unsigned integers Brian Masney
2016-11-10 9:25 ` [PATCH v3 13/28] staging: iio: tsl2583: change newlines to improve readability Brian Masney
2016-11-10 9:25 ` [PATCH v3 14/28] staging: iio: tsl2583: combine sysfs documentation Brian Masney
2016-11-10 9:25 ` [PATCH v3 15/28] staging: iio: tsl2583: fix multiline comment syntax Brian Masney
2016-11-10 9:25 ` [PATCH v3 16/28] staging: iio: tsl2583: updated code comment to match what the code does Brian Masney
2016-11-12 16:36 ` Jonathan Cameron
2016-11-12 16:59 ` Brian Masney
2016-11-12 17:10 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 17/28] staging: iio: tsl2583: moved code block inside else statement Brian Masney
2016-11-10 9:25 ` [PATCH v3 18/28] staging: iio: tsl2583: change tsl2583_als_calibrate() to return 0 on success Brian Masney
2016-11-10 9:25 ` [PATCH v3 19/28] staging: iio: tsl2583: remove unnecessary parentheses Brian Masney
2016-11-10 9:25 ` [PATCH v3 20/28] staging: iio: tsl2583: don't assume an unsigned int is 32 bits Brian Masney
2016-11-12 16:38 ` Jonathan Cameron
2016-12-05 20:55 ` Dan Carpenter
2016-11-10 9:25 ` [PATCH v3 21/28] staging: iio: tsl2583: move from a global to a per device lux table Brian Masney
2016-11-12 16:44 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 22/28] staging: iio: tsl2583: add tsl2583 to list of supported devices in the header Brian Masney
2016-11-10 9:25 ` [PATCH v3 23/28] staging: iio: tsl2583: clarified comment about clearing interrupts Brian Masney
2016-11-10 9:26 ` [PATCH v3 24/28] staging: iio: tsl2583: remove comment for tsl2583_probe() Brian Masney
2016-11-10 9:26 ` [PATCH v3 25/28] staging: iio: tsl2583: remove unnecessary memset call Brian Masney
2016-11-10 9:26 ` [PATCH v3 26/28] staging: iio: tsl2583: remove unnecessary variable initialization Brian Masney
2016-11-10 9:26 ` [PATCH v3 27/28] staging: iio: tsl2583: add copyright and MODULE_AUTHOR Brian Masney
2016-11-10 9:26 ` [PATCH v3 28/28] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-12 16:47 ` 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=b30b4883-07ff-b2aa-7034-e9713e1dfca2@kernel.org \
--to=jic23@kernel.org \
--cc=Jon.Brenner@ams.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.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).