Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1531730 > unrolled thread
| Started by | William Breathitt Gray <vilhelm.gray@gmail.com> |
|---|---|
| First post | 2016-11-28 23:00 +0100 |
| Last post | 2016-12-03 15:50 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR William Breathitt Gray <vilhelm.gray@gmail.com> - 2016-11-28 23:00 +0100
Re: [PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR Jonathan Cameron <jic23@kernel.org> - 2016-12-03 15:50 +0100
| From | William Breathitt Gray <vilhelm.gray@gmail.com> |
|---|---|
| Date | 2016-11-28 23:00 +0100 |
| Subject | [PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR |
| Message-ID | <sIC7U-7Cs-17@gated-at.bofh.it> |
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>
---
drivers/iio/counter/104-quad-8.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
index 2d2ee35..412d283 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;
--
2.10.2
[toc] | [next] | [standalone]
| From | Jonathan Cameron <jic23@kernel.org> |
|---|---|
| Date | 2016-12-03 15:50 +0100 |
| Subject | Re: [PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR |
| Message-ID | <sKjNw-2Bb-7@gated-at.bofh.it> |
| In reply to | #1531730 |
On 28/11/16 21:55, William Breathitt Gray wrote:
> 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>
Applied to the fixes-togreg-post-rc1 branch and marked for stable.
Will push out when I next have a net connection and remember!
Jonathan
> ---
> drivers/iio/counter/104-quad-8.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/counter/104-quad-8.c b/drivers/iio/counter/104-quad-8.c
> index 2d2ee35..412d283 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;
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web