From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 16 Jul 2023 14:57:40 +0000 (+0200)
Subject: 6.4-stable patches
X-Git-Tag: v6.1.39~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8caf2caec7c13c6f0d615c46ef297936c49ff891;p=thirdparty%2Fkernel%2Fstable-queue.git

6.4-stable patches

added patches:
	input-ads7846-fix-pointer-cast-warning.patch
---

diff --git a/queue-6.4/input-ads7846-fix-pointer-cast-warning.patch b/queue-6.4/input-ads7846-fix-pointer-cast-warning.patch
new file mode 100644
index 00000000000..c020d3fce5b
--- /dev/null
+++ b/queue-6.4/input-ads7846-fix-pointer-cast-warning.patch
@@ -0,0 +1,37 @@
+From 11ca605653480b2ddc70ec142a0a686796a7fc87 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 9 Jun 2023 22:20:56 +0200
+Subject: Input: ads7846 - fix pointer cast warning
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 11ca605653480b2ddc70ec142a0a686796a7fc87 upstream.
+
+The previous bugfix caused a warning on 64-bit builds:
+
+drivers/input/touchscreen/ads7846.c:1126:17: warning: cast to smaller integer type 'u32' (aka 'unsigned int') from 'const void *' [-Wvoid-pointer-to-int-cast]
+
+Change the cast back to something that works on both 32-bit and 64-bit
+kernels.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202306100442.jStknDT1-lkp@intel.com/
+Fixes: 8f7913c04f6a7 ("Input: ads7846 - Fix usage of match data")
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/input/touchscreen/ads7846.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/input/touchscreen/ads7846.c
++++ b/drivers/input/touchscreen/ads7846.c
+@@ -1123,7 +1123,7 @@ static const struct ads7846_platform_dat
+ 	if (!pdata)
+ 		return ERR_PTR(-ENOMEM);
+ 
+-	pdata->model = (u32)device_get_match_data(dev);
++	pdata->model = (uintptr_t)device_get_match_data(dev);
+ 
+ 	device_property_read_u16(dev, "ti,vref-delay-usecs",
+ 				 &pdata->vref_delay_usecs);
diff --git a/queue-6.4/series b/queue-6.4/series
index 57894a720f5..98904b53a7b 100644
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -775,3 +775,4 @@ blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.pat
 input-ads7846-fix-usage-of-match-data.patch
 md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch
 fs-no-need-to-check-source.patch
+input-ads7846-fix-pointer-cast-warning.patch