From: Greg Kroah-Hartman Date: Wed, 6 Nov 2024 07:01:59 +0000 (+0100) Subject: drop queue-6.11/iio-light-veml6030-fix-microlux-value-calculation.patch-18046 X-Git-Tag: v4.19.323~39 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaccc1f039a66d2f8342aabe939836fc0b27a299;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.11/iio-light-veml6030-fix-microlux-value-calculation.patch-18046 it's a duplicate --- diff --git a/queue-6.11/iio-light-veml6030-fix-microlux-value-calculation.patch-18046 b/queue-6.11/iio-light-veml6030-fix-microlux-value-calculation.patch-18046 deleted file mode 100644 index 9e7eef75ccf..00000000000 --- a/queue-6.11/iio-light-veml6030-fix-microlux-value-calculation.patch-18046 +++ /dev/null @@ -1,47 +0,0 @@ -From 617e0a742fa1ec269638d280602c22c4ebd702b2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 16 Oct 2024 19:04:31 +0200 -Subject: iio: light: veml6030: fix microlux value calculation - -From: Javier Carrasco - -[ Upstream commit 63dd163cd61dda6f38343776b42331cc6b7e56e0 ] - -The raw value conversion to obtain a measurement in lux as -INT_PLUS_MICRO does not calculate the decimal part properly to display -it as micro (in this case microlux). It only calculates the module to -obtain the decimal part from a resolution that is 10000 times the -provided in the datasheet (0.5376 lux/cnt for the veml6030). The -resulting value must still be multiplied by 100 to make it micro. - -This bug was introduced with the original implementation of the driver. - -Only the illuminance channel is fixed becuase the scale is non sensical -for the intensity channels anyway. - -Cc: stable@vger.kernel.org -Fixes: 7b779f573c48 ("iio: light: add driver for veml6030 ambient light sensor") -Signed-off-by: Javier Carrasco -Link: https://patch.msgid.link/20241016-veml6030-fix-processed-micro-v1-1-4a5644796437@gmail.com -Signed-off-by: Jonathan Cameron -Signed-off-by: Sasha Levin ---- - drivers/iio/light/veml6030.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/iio/light/veml6030.c b/drivers/iio/light/veml6030.c -index 621428885455c..8e76c828afddc 100644 ---- a/drivers/iio/light/veml6030.c -+++ b/drivers/iio/light/veml6030.c -@@ -535,7 +535,7 @@ static int veml6030_read_raw(struct iio_dev *indio_dev, - } - if (mask == IIO_CHAN_INFO_PROCESSED) { - *val = (reg * data->cur_resolution) / 10000; -- *val2 = (reg * data->cur_resolution) % 10000; -+ *val2 = (reg * data->cur_resolution) % 10000 * 100; - return IIO_VAL_INT_PLUS_MICRO; - } - *val = reg; --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 06c3fe2249e..1ce450fc0e5 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -150,7 +150,6 @@ phy-freescale-imx8m-pcie-do-cmn_rst-just-before-phy-.patch btrfs-merge-btrfs_orig_bbio_end_io-into-btrfs_bio_en.patch btrfs-fix-error-propagation-of-split-bios.patch spi-spi-fsl-dspi-fix-crash-when-not-using-gpio-chip-.patch -iio-light-veml6030-fix-microlux-value-calculation.patch-18046 riscv-vdso-prevent-the-compiler-from-inserting-calls.patch input-edt-ft5x06-fix-regmap-leak-when-probe-fails.patch alsa-hda-realtek-limit-internal-mic-boost-on-dell-pl.patch