5.10-stable patches

added patches:
	iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch

diff --git a/queue-5.10/iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch b/queue-5.10/iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch
new file mode 100644 (file)
index 0000000..1a6fe4e
--- /dev/null
+++ b/queue-5.10/iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch
@@ -0,0 +1,36 @@
+From b1cb00d51e361cf5af93649917d9790e1623647e Mon Sep 17 00:00:00 2001
+From: Brian Masney <bmasney@redhat.com>
+Date: Mon, 3 Apr 2023 21:14:55 -0400
+Subject: iio: light: tsl2772: fix reading proximity-diodes from device tree
+
+From: Brian Masney <bmasney@redhat.com>
+
+commit b1cb00d51e361cf5af93649917d9790e1623647e upstream.
+
+tsl2772_read_prox_diodes() will correctly parse the properties from
+device tree to determine which proximity diode(s) to read from, however
+it didn't actually set this value on the struct tsl2772_settings. Let's
+go ahead and fix that.
+
+Reported-by: Tom Rix <trix@redhat.com>
+Link: https://lore.kernel.org/lkml/20230327120823.1369700-1-trix@redhat.com/
+Fixes: 94cd1113aaa0 ("iio: tsl2772: add support for reading proximity led settings from device tree")
+Signed-off-by: Brian Masney <bmasney@redhat.com>
+Link: https://lore.kernel.org/r/20230404011455.339454-1-bmasney@redhat.com
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/light/tsl2772.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iio/light/tsl2772.c
++++ b/drivers/iio/light/tsl2772.c
+@@ -606,6 +606,7 @@ static int tsl2772_read_prox_diodes(stru
+                       return -EINVAL;
+               }
+       }
++      chip->settings.prox_diode = prox_diode_mask;
+ 
+       return 0;
+ }

diff --git a/queue-5.10/series b/queue-5.10/series
index 7e44199f179707a42e8193c23ed017b7f3c4343a..0590652f377732a0799e923ff67d2cd53a76dd0e 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -26,5 +26,5 @@ s390-ptrace-fix-ptrace_get_last_break-error-handling.patch
 nvme-tcp-fix-a-possible-uaf-when-failing-to-allocate.patch
 xen-netback-use-same-error-messages-for-same-errors.patch
 powerpc-doc-fix-htmldocs-errors.patch
-pwm-meson-explicitly-set-.polarity-in-.get_state.patch
 xfs-drop-submit-side-trans-alloc-for-append-ioends.patch
+iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch