---

yaml --- r: 337699 b: refs/heads/master c: 98efb70 h: refs/heads/master i: 337697: f5aa3ba 337695: 032b026 v: v3
git-mirror · Nov 5, 2012 · 93e7b1a · 93e7b1a
1 parent dd601bb
commit 93e7b1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;
 	}