aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Breathitt Gray <vilhelm.gray@gmail.com>2016-11-28 16:55:34 -0500
committerJonathan Cameron <jic23@kernel.org>2016-12-03 05:03:07 -0500
commit7e1c4058e741c781b262b15a2e86a40602aaa6b6 (patch)
tree713e1422a8bc6cc40dbb8497ed45c76174aac6fe
parent47af2c676ae1e84140225d261a00bdf88f1f9f7e (diff)
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>
-rw-r--r--drivers/iio/counter/104-quad-8.c4
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,
153 ior_cfg = val | priv->preset_enable[chan->channel] << 1; 153 ior_cfg = val | priv->preset_enable[chan->channel] << 1;
154 154
155 /* Load I/O control configuration */ 155 /* Load I/O control configuration */
156 outb(0x40 | ior_cfg, base_offset); 156 outb(0x40 | ior_cfg, base_offset + 1);
157 157
158 return 0; 158 return 0;
159 case IIO_CHAN_INFO_SCALE: 159 case IIO_CHAN_INFO_SCALE:
@@ -241,7 +241,7 @@ static ssize_t quad8_write_set_to_preset_on_index(struct iio_dev *indio_dev,
241 size_t len) 241 size_t len)
242{ 242{
243 struct quad8_iio *const priv = iio_priv(indio_dev); 243 struct quad8_iio *const priv = iio_priv(indio_dev);
244 const int base_offset = priv->base + 2 * chan->channel; 244 const int base_offset = priv->base + 2 * chan->channel + 1;
245 bool preset_enable; 245 bool preset_enable;
246 int ret; 246 int ret;
247 unsigned int ior_cfg; 247 unsigned int ior_cfg;