FAILED: patch "[PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IOR" failed to apply to 4.9-stable tree
Subsystems (2)
[email protected]
maintainerThe 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 <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
7e1c4058e741c781b262b15a2e86a40602aaa6b6Mon Sep 17 00:00:00 2001
From: William Breathitt Gray <[email protected]>
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.
drivers/iio/counter/104-quad-8.c +2 -2
@@ -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;
Quoted 9 lines · On Mon, Jan 09, 2017 at 09:27:31AM +0100, [email protected] 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 <[email protected]>.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
Quoted 41 lines
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
7e1c4058e741c781b262b15a2e86a40602aaa6b6Mon Sep 17 00:00:00 2001From: William Breathitt Gray <[email protected]>
Date: Mon, 28 Nov 2016 16:55:34 -0500
Subject: [PATCH] iio: 104-quad-8: Fix off-by-one errors when addressing IORThe 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 <[email protected]>Cc <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>drivers/iio/counter/104-quad-8.c +2
-2@@ -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;
Quoted 11 lines · William Breathitt Gray
Quoted 4 lines · On Mon, Jan 09, 2017 at 09:27:31AM +0100, [email protected] 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 gitcommit
Quoted 4 lines
id to <[email protected]>.
thanks,
Quoted 7 lines
Quoted 1 line
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!
Quoted 50 lines
William Breathitt Gray
Quoted 7 lines
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
7e1c4058e741c781b262b15a2e86a40602aaa6b6Mon Sep 17 00:00:00 2001From: William Breathitt Gray <[email protected]>
Date: Mon, 28 Nov 2016 16:55:34 -0500
Subject: [PATCH] iio: 104-quad-8: Fix off-by-one errors whenaddressing IOR
Quoted 4 lines
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
Quoted 3 lines
properly offset.
Fixes 28e5d3bb0325 ("iio: 104-quad-8: Add IIO support for the ACCES104-QUAD-8")
Review
Quoted 5 lines
Signed-off-by William Breathitt Gray <[email protected]>Cc <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>(quoted diff) +0
-0
b/drivers/iio/counter/104-quad-8.cdrivers/iio/counter/104-quad-8.c static int quad8_write_raw(struct iio_dev
Quoted 4 lines
index
c0a69d7e9ce7..07b6d20c0756100644drivers/iio/counter/104-quad-8.c +0
-0@@ -153,7 +153,7 @@ static int quad8_write_raw(struct iio_dev
*indio_dev,drivers/iio/counter/104-quad-8.c static ssize_t
Quoted 9 lines
drivers/iio/counter/104-quad-8.c +1
-1ior_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_tquad8_write_set_to_preset_on_index(struct
iio_dev*indio_dev,Quoted 9 lines
drivers/iio/counter/104-quad-8.c +1
-1size_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;
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.