From: Sasha Levin Date: Thu, 30 Dec 2021 02:22:50 +0000 (-0500) Subject: Fixes for 4.4 X-Git-Tag: v4.4.298~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33f291a81c9131b5b32dd2a495c493fa700eb156;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/platform-x86-apple-gmux-use-resource_size-with-res.patch b/queue-4.4/platform-x86-apple-gmux-use-resource_size-with-res.patch new file mode 100644 index 00000000000..51abf7b6cec --- /dev/null +++ b/queue-4.4/platform-x86-apple-gmux-use-resource_size-with-res.patch @@ -0,0 +1,37 @@ +From 16d2afad820f6a16317008e82695331cfe1b6822 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 14 Dec 2021 04:18:36 -0800 +Subject: platform/x86: apple-gmux: use resource_size() with res + +From: Wang Qing + +[ Upstream commit eb66fb03a727cde0ab9b1a3858de55c26f3007da ] + +This should be (res->end - res->start + 1) here actually, +use resource_size() derectly. + +Signed-off-by: Wang Qing +Link: https://lore.kernel.org/r/1639484316-75873-1-git-send-email-wangqing@vivo.com +Reviewed-by: Hans de Goede +Signed-off-by: Hans de Goede +Signed-off-by: Sasha Levin +--- + 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 976efeb3f2ba3..a0f10ccdca3e4 100644 +--- a/drivers/platform/x86/apple-gmux.c ++++ b/drivers/platform/x86/apple-gmux.c +@@ -461,7 +461,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.4/series b/queue-4.4/series index e69de29bb2d..b5e34deb28b 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -0,0 +1 @@ +platform-x86-apple-gmux-use-resource_size-with-res.patch