From ffedaee333b8512f50a39ace1f03febc93fc601f Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Fri, 30 Sep 2011 10:05:32 +0100 Subject: [PATCH] --- yaml --- r: 268589 b: refs/heads/master c: 5357ba3df4af9da111fb351292c9a410b1f7ab0a h: refs/heads/master i: 268587: 728b91469fb35c57d701a9654e673389e9996c03 v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/ad799x_core.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4db248d8497e..6f5436839caf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c626f58ab0095d7614636cc81f6081426903a37 +refs/heads/master: 5357ba3df4af9da111fb351292c9a410b1f7ab0a diff --git a/trunk/drivers/staging/iio/adc/ad799x_core.c b/trunk/drivers/staging/iio/adc/ad799x_core.c index 975a3f7122cf..8a7dce05477c 100644 --- a/trunk/drivers/staging/iio/adc/ad799x_core.c +++ b/trunk/drivers/staging/iio/adc/ad799x_core.c @@ -158,12 +158,11 @@ static int ad799x_read_raw(struct iio_dev *dev_info, if (ret < 0) return ret; - *val = (ret >> st->chip_info->channel[0].scan_type.shift) & - RES_MASK(st->chip_info->channel[0].scan_type.realbits); + *val = (ret >> chan->scan_type.shift) & + RES_MASK(chan->scan_type.realbits); return IIO_VAL_INT; case (1 << IIO_CHAN_INFO_SCALE_SHARED): - scale_uv = (st->int_vref_mv * 1000) - >> st->chip_info->channel[0].scan_type.realbits; + scale_uv = (st->int_vref_mv * 1000) >> chan->scan_type.realbits; *val = scale_uv / 1000; *val2 = (scale_uv % 1000) * 1000; return IIO_VAL_INT_PLUS_MICRO;