From: Jonathan Cameron <jic23@cam.ac.uk>
To: "Hennerich, Michael" <Michael.Hennerich@analog.com>
Cc: "linux-iio@vger.kernel.org" <linux-iio@vger.kernel.org>,
"device-drivers-devel@blackfin.uclinux.org"
<device-drivers-devel@blackfin.uclinux.org>,
Drivers <Drivers@analog.com>
Subject: Re: [PATCH 10/12] iio: ad7192: return len and fix out of range checking
Date: Wed, 31 Aug 2011 12:59:56 +0100 [thread overview]
Message-ID: <4E5E223C.50402@cam.ac.uk> (raw)
In-Reply-To: <544AC56F16B56944AEC3BD4E3D59177146E6F63982@LIMKCMBX1.ad.analog.com>
On 08/31/11 12:47, Hennerich, Michael wrote:
> Jonathan Cameron wrote on 2011-08-31:
>> On 08/31/11 11:57, michael.hennerich@analog.com wrote:
>>> From: Michael Hennerich <michael.hennerich@analog.com>
>>>
>>>
>> Is 4096 a valid value? I thought we only had 12 bits (hence the 0xFFF)
>> That would make maximum 4095
>
> Where do you see the 4096?
> There was a invalid check for smaller 4096 causing a return EINVAL.
Doh! + and - sign missread. Makes more sense now. Clearly need lunch an coffee!
>
> I removed the line and added the check for > 0xFFF....
>
>>> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
merged.
>>> ---
>>> drivers/staging/iio/adc/ad7291.c | 10 +++++++---
>>> 1 files changed, 7 insertions(+), 3 deletions(-)
>>> diff --git a/drivers/staging/iio/adc/ad7291.c
>>> b/drivers/staging/iio/adc/ad7291.c index 1a2fa66..334951c 100644 ---
>>> a/drivers/staging/iio/adc/ad7291.c +++
>>> b/drivers/staging/iio/adc/ad7291.c @@ -240,10 +240,14 @@ static inline
>>> ssize_t ad7291_set_hyst(struct device *dev,
>>>
>>> if (ret < 0)
>>> return ret;
>>> - if (data < 4096)
>>> + if (data > AD7291_VALUE_MASK)
>>> return -EINVAL;
>>> - return ad7291_i2c_write(chip, this_attr->address, data);
>>> + ret = ad7291_i2c_write(chip, this_attr->address, data);
>>> + if (ret < 0)
>>> + return ret;
>>> +
>>> + return len;
>>> }
>>>
>>> static IIO_DEVICE_ATTR(in_temp0_thresh_both_hyst_raw,
>>> @@ -351,7 +355,7 @@ static int ad7291_write_event_value(struct iio_dev
>>> *indio_dev,
>>>
>>> switch (IIO_EVENT_CODE_EXTRACT_CHAN_TYPE(event_code)) {
>>> case IIO_VOLTAGE:
>>> - if (val > 0xFFF || val < 0)
>>> + if (val > AD7291_VALUE_MASK || val < 0)
>>> return -EINVAL; reg =
>>> ad7291_limit_regs[IIO_EVENT_CODE_EXTRACT_NUM(event_code)]
>>> [!(IIO_EVENT_CODE_EXTRACT_DIR(event_code) ==
>>
>
> Greetings,
> Michael
>
> --
> Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
> Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
> Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin, Margaret Seif
>
>
>
>
next prev parent reply other threads:[~2011-08-31 11:51 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-31 10:57 [PATCH 01/12] iio: ad7291: fix channel mapping michael.hennerich
2011-08-31 10:57 ` [PATCH 02/12] iio: ad7291: Fix typos, change kconfig description and file header michael.hennerich
2011-08-31 11:18 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 03/12] iio: ad7291: Fix AD7291_T_SENSE_MASK michael.hennerich
2011-08-31 11:19 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 04/12] iio: ad7291: Add regulator, reference voltage and scale handling michael.hennerich
2011-08-31 11:22 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 05/12] iio: ad7291: don't swab results twice and introduce more register defines michael.hennerich
2011-08-31 11:28 ` Jonathan Cameron
2011-08-31 11:49 ` Hennerich, Michael
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 06/12] iio: ad7291: fix mask bit generation michael.hennerich
2011-08-31 11:29 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 07/12] iio: ad7291: introduce IIO_EVENT_CODE_EXTRACT_CHAN_TYPE and use accordingly michael.hennerich
2011-08-31 11:33 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 08/12] iio: ad7291: fix channel mapping for event enables michael.hennerich
2011-08-31 11:34 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 09/12] iio: core: fix IIO_EVENT_CODE_EXTRACT_DIR definition michael.hennerich
2011-08-31 11:15 ` Jonathan Cameron
2011-08-31 12:01 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 10/12] iio: ad7192: return len and fix out of range checking michael.hennerich
2011-08-31 11:37 ` Jonathan Cameron
2011-08-31 11:47 ` Hennerich, Michael
2011-08-31 11:59 ` Jonathan Cameron [this message]
2011-08-31 10:57 ` [PATCH 11/12] iio: ad7291: reset device and setup irq before it is enabled michael.hennerich
2011-08-31 11:39 ` Jonathan Cameron
2011-08-31 10:57 ` [PATCH 12/12] iio: ad7192: add temp_scale attribute, change module description michael.hennerich
2011-08-31 11:52 ` Jonathan Cameron
2011-08-31 11:14 ` [PATCH 01/12] iio: ad7291: fix channel mapping 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=4E5E223C.50402@cam.ac.uk \
--to=jic23@cam.ac.uk \
--cc=Drivers@analog.com \
--cc=Michael.Hennerich@analog.com \
--cc=device-drivers-devel@blackfin.uclinux.org \
--cc=linux-iio@vger.kernel.org \
/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).