From 93e7b1a14d13db79e11bdff03c423b83ec073586 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Mon, 5 Nov 2012 09:56:00 +0000 Subject: [PATCH] --- yaml --- r: 337699 b: refs/heads/master c: 98efb70adde96d86df29b4754f265b2c8bba01b2 h: refs/heads/master i: 337697: f5aa3baaa95b8ef791445f8653928e25fc250d8d 337695: 032b026e3a7dc7df29331a032096cb883ea5ce9e v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/adc/ad7887.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b245e376e763..e76e3495406b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fce7c3eac7d4ca77ada5bf8332f867219fbb5068 +refs/heads/master: 98efb70adde96d86df29b4754f265b2c8bba01b2 diff --git a/trunk/drivers/staging/iio/adc/ad7887.c b/trunk/drivers/staging/iio/adc/ad7887.c index 3ac0c305e123..72cfe191cd83 100644 --- a/trunk/drivers/staging/iio/adc/ad7887.c +++ b/trunk/drivers/staging/iio/adc/ad7887.c @@ -177,8 +177,8 @@ static int ad7887_read_raw(struct iio_dev *indio_dev, 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; + *val &= RES_MASK(chan->scan_type.realbits); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: if (st->reg) { @@ -190,7 +190,7 @@ static int ad7887_read_raw(struct iio_dev *indio_dev, *val = st->chip_info->int_vref_mv; } - *val2 = st->chip_info->channel[0].scan_type.realbits; + *val2 = chan->scan_type.realbits; return IIO_VAL_FRACTIONAL_LOG2; }