From db9b26b25ff8aa561baa2bf2fbb4e8c82f073b41 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Fri, 2 Sep 2011 17:25:31 +0100 Subject: [PATCH] --- yaml --- r: 268186 b: refs/heads/master c: fe55a170399a0f30d1268848d2cb99dcf8fa413b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/ad7152.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0389d34ea375..930c05550935 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3b7915df6356cee6412f24fbdcbf4f7ec107a5a +refs/heads/master: fe55a170399a0f30d1268848d2cb99dcf8fa413b diff --git a/trunk/drivers/staging/iio/adc/ad7152.c b/trunk/drivers/staging/iio/adc/ad7152.c index 122d56cd445d..42996b96b850 100644 --- a/trunk/drivers/staging/iio/adc/ad7152.c +++ b/trunk/drivers/staging/iio/adc/ad7152.c @@ -160,9 +160,9 @@ static IIO_DEVICE_ATTR(in_capacitance0_calibscale_calibration, static IIO_DEVICE_ATTR(in_capacitance1_calibscale_calibration, S_IWUSR, NULL, ad7152_start_gain_calib, 1); -/* Values are Update Rate (Hz), Conversion Time (ms) */ +/* Values are Update Rate (Hz), Conversion Time (ms) + 1*/ static const unsigned char ad7152_filter_rate_table[][2] = { - {200, 5}, {50, 20}, {20, 50}, {17, 60}, + {200, 5 + 1}, {50, 20 + 1}, {20, 50 + 1}, {17, 60 + 1}, }; static ssize_t ad7152_show_filter_rate_setup(struct device *dev, @@ -367,6 +367,9 @@ static int ad7152_read_raw(struct iio_dev *indio_dev, goto out; *val = swab16(ret); + if (chan->differential) + *val -= 0x8000; + ret = IIO_VAL_INT; break; case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):