]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Mar 2017 09:17:36 +0000 (10:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Mar 2017 09:17:36 +0000 (10:17 +0100)
added patches:
spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch

queue-4.10/series
queue-4.10/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch [new file with mode: 0644]

index 2d5b5bd4ebf9561ecfe7456f2830b736a4a89487..58ea54e8c2ca791d1624371e41c14c88c8f73864 100644 (file)
@@ -18,3 +18,4 @@ dvb-usb-don-t-use-stack-for-firmware-load.patch
 lirc_dev-lirc_-g-s-et_rec_mode-do-not-work.patch
 media-properly-pass-through-media-entity-types-in-entity-enumeration.patch
 ext4-fix-deadlock-between-inline_data-and-ext4_expand_extra_isize_ea.patch
+spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch
diff --git a/queue-4.10/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch b/queue-4.10/spi-s3c64xx-fix-inconsistency-between-binding-and-driver.patch
new file mode 100644 (file)
index 0000000..6060a8d
--- /dev/null
@@ -0,0 +1,40 @@
+From 379f831a927817c130a62e3ca0082ae685557324 Mon Sep 17 00:00:00 2001
+From: Andi Shyti <andi.shyti@samsung.com>
+Date: Fri, 10 Feb 2017 11:20:19 +0900
+Subject: spi: s3c64xx: fix inconsistency between binding and driver
+
+From: Andi Shyti <andi.shyti@samsung.com>
+
+commit 379f831a927817c130a62e3ca0082ae685557324 upstream.
+
+Commit a92e7c3d82a1 ("spi: s3c64xx: consider the case when the CS
+line is not connected") introduced an inconsistency between the
+binding, where the disconnected CS line was marked as
+'no-cs-readback', and the driver.
+
+The driver is erroneously checking for that attribute with
+property name of 'broken-cs'.
+
+Check for 'no-cs-readback' in the driver as well.
+
+Fixes: a92e7c3d82a1 ("spi: s3c64xx: consider the case when the CS line is not connected")
+Signed-off-by: Andi Shyti <andi.shyti@samsung.com>
+Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-s3c64xx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-s3c64xx.c
++++ b/drivers/spi/spi-s3c64xx.c
+@@ -996,7 +996,7 @@ static struct s3c64xx_spi_info *s3c64xx_
+               sci->num_cs = temp;
+       }
+-      sci->no_cs = of_property_read_bool(dev->of_node, "broken-cs");
++      sci->no_cs = of_property_read_bool(dev->of_node, "no-cs-readback");
+       return sci;
+ }