Skip to content

Commit

Permalink
iio: 104-quad-8: Fix off-by-one errors when addressing IOR
Browse files Browse the repository at this point in the history
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: 28e5d3b ("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>
  • Loading branch information
William Breathitt Gray authored and Jonathan Cameron committed Dec 3, 2016
1 parent 47af2c6 commit 7e1c405
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/iio/counter/104-quad-8.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 7e1c405

Please sign in to comment.