diff options
| author | Luis de Bethencourt <luisbg@osg.samsung.com> | 2016-06-01 20:25:54 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-06-11 18:37:13 +0100 |
| commit | f4070a19142d5ee06f0da0cef56a0e78995f172c (patch) | |
| tree | 8a4e14d0addc0c0ae15d048a60223b769a7827cf /drivers/staging/iio/impedance-analyzer/ad5933.c | |
| parent | 7e982555d89cc84b1fa23b5d54c7ffd9f7753908 (diff) | |
| download | op-kernel-dev-f4070a19142d5ee06f0da0cef56a0e78995f172c.zip op-kernel-dev-f4070a19142d5ee06f0da0cef56a0e78995f172c.tar.gz | |
staging: iio: ad5933: fix order of cycle conditions
Correctly handle the settling time cycles value. The else branch is an
impossible condition, > 1022 in the else branch of > 511. Flipping the order.
Based on the Table 13 at the bottom of Page 25 of the Data Sheet:
http://www.analog.com/media/en/technical-documentation/data-sheets/AD5933.pdf
Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Reviewed-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio/impedance-analyzer/ad5933.c')
| -rw-r--r-- | drivers/staging/iio/impedance-analyzer/ad5933.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c index 9f43976..170ac98 100644 --- a/drivers/staging/iio/impedance-analyzer/ad5933.c +++ b/drivers/staging/iio/impedance-analyzer/ad5933.c @@ -444,10 +444,10 @@ static ssize_t ad5933_store(struct device *dev, st->settling_cycles = val; /* 2x, 4x handling, see datasheet */ - if (val > 511) - val = (val >> 1) | (1 << 9); - else if (val > 1022) + if (val > 1022) val = (val >> 2) | (3 << 9); + else if (val > 511) + val = (val >> 1) | (1 << 9); dat = cpu_to_be16(val); ret = ad5933_i2c_write(st->client, |
