diff options
| author | William Breathitt Gray <vilhelm.gray@gmail.com> | 2016-11-28 16:55:34 -0500 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-12-03 10:03:07 +0000 |
| commit | 7e1c4058e741c781b262b15a2e86a40602aaa6b6 (patch) | |
| tree | 713e1422a8bc6cc40dbb8497ed45c76174aac6fe /drivers | |
| parent | 47af2c676ae1e84140225d261a00bdf88f1f9f7e (diff) | |
| download | linux-stable-7e1c4058e741c781b262b15a2e86a40602aaa6b6.tar.gz linux-stable-7e1c4058e741c781b262b15a2e86a40602aaa6b6.tar.bz2 linux-stable-7e1c4058e741c781b262b15a2e86a40602aaa6b6.zip | |
iio: 104-quad-8: Fix off-by-one errors when addressing IOR
The Input/Output Control register (IOR) is offset by 1 from the
respective channel data register. This patch fixes off-by-one errors
when attempting to write to a channel IOR where the base address was not
properly offset.
Fixes: 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES 104-QUAD-8")
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/counter/104-quad-8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c index c0a69d7e9ce7..07b6d20c0756 100644 --- a/drivers/iio/counter/104-quad-8.c +++ b/drivers/iio/counter/104-quad-8.c @@ -153,7 +153,7 @@ static int quad8_write_raw(struct iio_dev *indio_dev, ior_cfg = val | priv->preset_enable[chan->channel] << 1; /* Load I/O control configuration */ - outb(0x40 | ior_cfg, base_offset); + outb(0x40 | ior_cfg, base_offset + 1); return 0; case IIO_CHAN_INFO_SCALE: @@ -241,7 +241,7 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev, size_t len) { struct quad8_iio *const priv = iio_priv(indio_dev); - const int base_offset = priv->base + 2 * chan->channel; + const int base_offset = priv->base + 2 * chan->channel + 1; bool preset_enable; int ret; unsigned int ior_cfg; |