diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2011-09-02 12:14:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 19:01:59 -0400 |
commit | 32b5eecab0f2d6f66f2e237e161d58d5916f8b13 (patch) | |
tree | c1acfa34fc1e402e38abda3ff0caa505fe8a48b1 /drivers/staging/iio/impedance-analyzer/ad5933.c | |
parent | bd94c6a8a6d3499e857002b1f445162fba941029 (diff) |
staging:iio: Switch the channel masks to bitmaps so as to allow for more channels.
This is as light as possible on changes to current drivers.
Some drivers make assumptions that their masks fit in a single
long. Given they were previously working this is clearly valid if
not tidy.
The max1363 is an example where there should be no such assumptions.
V2: Add the new ad5933
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <Michael.Hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/impedance-analyzer/ad5933.c')
-rw-r--r-- | drivers/staging/iio/impedance-analyzer/ad5933.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index 1c1cd8eac9d..e199bbed75e 100644 --- a/drivers/staging/iio/impedance-analyzer/ad5933.c +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c | |||
@@ -640,7 +640,7 @@ static void ad5933_work(struct work_struct *work) | |||
640 | 640 | ||
641 | if (status & AD5933_STAT_DATA_VALID) { | 641 | if (status & AD5933_STAT_DATA_VALID) { |
642 | ad5933_i2c_read(st->client, | 642 | ad5933_i2c_read(st->client, |
643 | (ring->scan_mask & (1 << 0)) ? | 643 | test_bit(1, ring->scan_mask) ? |
644 | AD5933_REG_REAL_DATA : AD5933_REG_IMAG_DATA, | 644 | AD5933_REG_REAL_DATA : AD5933_REG_IMAG_DATA, |
645 | ring->scan_count * 2, (u8 *)buf); | 645 | ring->scan_count * 2, (u8 *)buf); |
646 | 646 | ||