From: Greg Kroah-Hartman Date: Sat, 22 Apr 2023 16:06:29 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v4.14.314~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98eee96900187d8d4891fe2c5860946c8ca2669c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch --- diff --git a/queue-5.15/iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch b/queue-5.15/iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch new file mode 100644 index 00000000000..1a6fe4eb6e0 --- /dev/null +++ b/queue-5.15/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 +Date: Mon, 3 Apr 2023 21:14:55 -0400 +Subject: iio: light: tsl2772: fix reading proximity-diodes from device tree + +From: Brian Masney + +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 +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 +Link: https://lore.kernel.org/r/20230404011455.339454-1-bmasney@redhat.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + 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.15/series b/queue-5.15/series index 389a8c55a1e..3d8510d2ed8 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -33,5 +33,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 platform-x86-gigabyte-wmi-add-support-for-x570s-aoru.patch -pwm-meson-explicitly-set-.polarity-in-.get_state.patch rtmutex-add-acquire-semantics-for-rtmutex-lock-acquisition-slow-path.patch +iio-light-tsl2772-fix-reading-proximity-diodes-from-device-tree.patch