Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/platform-x86-apple-gmux-use-resource_size-with-res.patch b/queue-4.14/platform-x86-apple-gmux-use-resource_size-with-res.patch
new file mode 100644 (file)
index 0000000..7e0ff3c
--- /dev/null
+++ b/queue-4.14/platform-x86-apple-gmux-use-resource_size-with-res.patch
@@ -0,0 +1,37 @@
+From 2dc2524845886ad89de4910caf1828d5b9c15fdd Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 14 Dec 2021 04:18:36 -0800
+Subject: platform/x86: apple-gmux: use resource_size() with res
+
+From: Wang Qing <wangqing@vivo.com>
+
+[ Upstream commit eb66fb03a727cde0ab9b1a3858de55c26f3007da ]
+
+This should be (res->end - res->start + 1) here actually,
+use resource_size() derectly.
+
+Signed-off-by: Wang Qing <wangqing@vivo.com>
+Link: https://lore.kernel.org/r/1639484316-75873-1-git-send-email-wangqing@vivo.com
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/platform/x86/apple-gmux.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
+index 7c4eb86c851ed..5463d740f3523 100644
+--- a/drivers/platform/x86/apple-gmux.c
++++ b/drivers/platform/x86/apple-gmux.c
+@@ -628,7 +628,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
+       }
+ 
+       gmux_data->iostart = res->start;
+-      gmux_data->iolen = res->end - res->start;
++      gmux_data->iolen = resource_size(res);
+ 
+       if (gmux_data->iolen < GMUX_MIN_IO_LEN) {
+               pr_err("gmux I/O region too small (%lu < %u)\n",
+-- 
+2.34.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 55c416b2c8303e5624cf6c15cb0e14f4e2b6fe40..23a01d78c8fb378ad5e194d0f2443437ce011f96 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1,2 +1,3 @@
 hid-asus-add-depends-on-usb_hid-to-hid_asus-kconfig-option.patch
 tee-handle-lookup-of-shm-with-reference-count-0.patch
+platform-x86-apple-gmux-use-resource_size-with-res.patch