From: Jonathan Cameron <jic23@kernel.org>
To: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PATCH 13/15] staging:iio:adis16260: Add proper range checks to write_frequency()
Date: Sat, 27 Jul 2013 13:04:25 +0100 [thread overview]
Message-ID: <51F3B749.3040906@kernel.org> (raw)
In-Reply-To: <1374072279-7140-13-git-send-email-lars@metafoo.de>
On 07/17/13 15:44, Lars-Peter Clausen wrote:
> A negative sampling frequency is obviously invalid, so use kstrtouint() instead
> of strict_strtoul. Also when setting a sampling frequency smaller than the
> minimum supported frequency set the frequency to the minimum supported frequency
> instead of just cutting off the upper bits of the raw register value.
>
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git
Thanks
> ---
> drivers/staging/iio/gyro/adis16260_core.c | 29 +++++++++++++----------------
> 1 file changed, 13 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
> index b8a6a04..d4e3dd7 100644
> --- a/drivers/staging/iio/gyro/adis16260_core.c
> +++ b/drivers/staging/iio/gyro/adis16260_core.c
> @@ -142,29 +142,26 @@ static ssize_t adis16260_write_frequency(struct device *dev,
> {
> struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> struct adis *adis = iio_priv(indio_dev);
> - long val;
> + unsigned int val;
> int ret;
> u8 t;
>
> - ret = strict_strtol(buf, 10, &val);
> + ret = kstrtouint(buf, 10, &val);
> if (ret)
> return ret;
> - if (val == 0)
> - return -EINVAL;
>
> mutex_lock(&indio_dev->mlock);
> - if (spi_get_device_id(adis->spi)->driver_data) {
> - t = (256 / val);
> - if (t > 0)
> - t--;
> - t &= ADIS16260_SMPL_PRD_DIV_MASK;
> - } else {
> - t = (2048 / val);
> - if (t > 0)
> - t--;
> - t &= ADIS16260_SMPL_PRD_DIV_MASK;
> - }
> - if ((t & ADIS16260_SMPL_PRD_DIV_MASK) >= 0x0A)
> + if (spi_get_device_id(adis->spi)->driver_data)
> + t = 256 / val;
> + else
> + t = 2048 / val;
> +
> + if (t > ADIS16260_SMPL_PRD_DIV_MASK)
> + t = ADIS16260_SMPL_PRD_DIV_MASK;
> + else if (t > 0)
> + t--;
> +
> + if (t >= 0x0A)
> adis->spi->max_speed_hz = ADIS16260_SPI_SLOW;
> else
> adis->spi->max_speed_hz = ADIS16260_SPI_FAST;
>
next prev parent reply other threads:[~2013-07-27 11:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 14:44 [PATCH 01/15] staging:iio:adis16260: Fix reading calibscale Lars-Peter Clausen
2013-07-17 14:44 ` [PATCH 02/15] staging:iio:adis16260: Drop unused 'negate' property Lars-Peter Clausen
2013-07-27 11:54 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 03/15] staging:iio:adis16260: Remove support for orientation mapping Lars-Peter Clausen
2013-07-20 9:28 ` Jonathan Cameron
2013-07-27 11:55 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 04/15] staging:iio:adis16260: Don't set default scan mask Lars-Peter Clausen
2013-07-27 11:56 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 05/15] staging:iio:adis16260: Remove separate header Lars-Peter Clausen
2013-07-27 11:59 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 06/15] staging:iio:adis16260: Add value range check for calibscale/-bias Lars-Peter Clausen
2013-07-27 11:58 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 07/15] staging:iio:adis16260: Use sign_extend32() instead of open-coding it Lars-Peter Clausen
2013-07-27 11:59 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 08/15] staging:iio:adis16260: Simplify calibscale and caliboffset reading Lars-Peter Clausen
2013-07-27 12:00 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 09/15] staging:iio:adis16260: Fix minor style issue Lars-Peter Clausen
2013-07-27 12:01 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 10/15] staging:iio:adis16260: Remove 'SPS' suffix from samplerate attribute Lars-Peter Clausen
2013-07-27 12:01 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 11/15] staging:iio:adis16260: Add scale for the inclination channel Lars-Peter Clausen
2013-07-27 12:02 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 12/15] staging:iio:adis16260: Remove unused includes Lars-Peter Clausen
2013-07-27 12:03 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 13/15] staging:iio:adis16260: Add proper range checks to write_frequency() Lars-Peter Clausen
2013-07-27 12:04 ` Jonathan Cameron [this message]
2013-07-17 14:44 ` [PATCH 14/15] staging:iio:adis16260: Remove sampling_frequency_available attribute Lars-Peter Clausen
2013-07-27 12:04 ` Jonathan Cameron
2013-07-17 14:44 ` [PATCH 15/15] staging:iio:adis16260: Move out of staging Lars-Peter Clausen
2013-07-27 12:08 ` Jonathan Cameron
2013-07-27 11:54 ` [PATCH 01/15] staging:iio:adis16260: Fix reading calibscale 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=51F3B749.3040906@kernel.org \
--to=jic23@kernel.org \
--cc=lars@metafoo.de \
--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).