FAILED: patch "[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR" failed to apply to 4.9-stable tree

FAILED: patch "[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR" failed to apply to 4.9-stable tree

[gregkh]

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 7e1c4058e741c781b262b15a2e86a40602aaa6b6 Mon Sep 17 00:00:00 2001
From: William Breathitt Gray <vilhelm.gray@gmail.com>
Date: Mon, 28 Nov 2016 16:55:34 -0500
Subject: [PATCH] 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>

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;

Re: FAILED: patch "[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR" failed to apply to 4.9-stable tree

[William Breathitt Gray]

On Mon, Jan 09, 2017 at 09:27:31AM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.9-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h

This patch fixes a commit in the current 4.10-rc tree; the relevant
commit is not present in the 4.9-stable tree.

I apologize for the confusion. In the future I'll try to be more
explicit whether fixes should be applied to the stable tree.

William Breathitt Gray

>
>------------------ original commit in Linus's tree ------------------
>
>>From 7e1c4058e741c781b262b15a2e86a40602aaa6b6 Mon Sep 17 00:00:00 2001
>From: William Breathitt Gray <vilhelm.gray@gmail.com>
>Date: Mon, 28 Nov 2016 16:55:34 -0500
>Subject: [PATCH] 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>
>
>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;
>

Re: FAILED: patch "[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR" failed to apply to 4.9-stable tree

[Jonathan Cameron]

On 9 January 2017 13:45:33 GMT+00:00, William Breathitt Gray <vilhelm.gray@gmail.com> wrote:
>On Mon, Jan 09, 2017 at 09:27:31AM +0100, gregkh@linuxfoundation.org
>wrote:
>>
>>The patch below does not apply to the 4.9-stable tree.
>>If someone wants it applied there, or to any other stable or longterm
>>tree, then please email the backport, including the original git
>commit
>>id to <stable@vger.kernel.org>.
>>
>>thanks,
>>
>>greg k-h
>
>This patch fixes a commit in the current 4.10-rc tree; the relevant
>commit is not present in the 4.9-stable tree.
>
>I apologize for the confusion. In the future I'll try to be more
>explicit whether fixes should be applied to the stable tree.
I was half asleep. Note these emails from Greg are automated so very little time wasted!
>
>William Breathitt Gray
>
>>
>>------------------ original commit in Linus's tree ------------------
>>
>>>From 7e1c4058e741c781b262b15a2e86a40602aaa6b6 Mon Sep 17 00:00:00 2001
>>From: William Breathitt Gray <vilhelm.gray@gmail.com>
>>Date: Mon, 28 Nov 2016 16:55:34 -0500
>>Subject: [PATCH] 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>
>>
>>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;
>>

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.