From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.19.201]:43351 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754683AbaFNOSB (ORCPT ); Sat, 14 Jun 2014 10:18:01 -0400 Message-ID: <539C5A0B.8030407@kernel.org> Date: Sat, 14 Jun 2014 15:19:55 +0100 From: Jonathan Cameron MIME-Version: 1.0 To: Lars-Peter Clausen , Peter Meerwald CC: linux-iio@vger.kernel.org Subject: Re: [PATCH v3 01/12] iio:adc:ad799x: Fix reading and writing of event values, apply shift References: <1402548856-3564-1-git-send-email-pmeerw@pmeerw.net> <1402548856-3564-2-git-send-email-pmeerw@pmeerw.net> <53995FD2.1040603@metafoo.de> In-Reply-To: <53995FD2.1040603@metafoo.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: linux-iio-owner@vger.kernel.org List-Id: linux-iio@vger.kernel.org On 12/06/14 09:07, Lars-Peter Clausen wrote: > On 06/12/2014 06:54 AM, Peter Meerwald wrote: >> last two bits of ADC and limit values are zero and should not be reported >> (ad7993, ad7997); compare with read_raw() >> >> event values are 10 (ad7993, ad7997) or 12 bit max., check the range on write >> >> Signed-off-by: Peter Meerwald > > Acked-by: Lars-Peter Clausen Given I've been rather slow on pull requests yet, fixes-togreg has this file in the wrong place at the moment. Hence I've applied this to fixes-togreg-post-3.16-rc1. I'll unwind this over the next day or so. > > Thanks. > >> --- >> drivers/iio/adc/ad799x.c | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c >> index 39b4cb4..6eba301 100644 >> --- a/drivers/iio/adc/ad799x.c >> +++ b/drivers/iio/adc/ad799x.c >> @@ -427,9 +427,12 @@ static int ad799x_write_event_value(struct iio_dev *indio_dev, >> int ret; >> struct ad799x_state *st = iio_priv(indio_dev); >> >> + if (val < 0 || val > RES_MASK(chan->scan_type.realbits)) >> + return -EINVAL; >> + >> mutex_lock(&indio_dev->mlock); >> ret = ad799x_i2c_write16(st, ad799x_threshold_reg(chan, dir, info), >> - val); >> + val << chan->scan_type.shift); >> mutex_unlock(&indio_dev->mlock); >> >> return ret; >> @@ -452,7 +455,8 @@ static int ad799x_read_event_value(struct iio_dev *indio_dev, >> mutex_unlock(&indio_dev->mlock); >> if (ret < 0) >> return ret; >> - *val = valin; >> + *val = (valin >> chan->scan_type.shift) & >> + RES_MASK(chan->scan_type.realbits); >> >> return IIO_VAL_INT; >> } >> > > -- > 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