From: Sasha Levin <sashal@kernel.org>
Date: Fri, 17 Jul 2020 12:56:01 +0000 (-0400)
Subject: Fixes for 4.9
X-Git-Tag: v4.4.231~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6615e9957c838c5bff90c29d052dba50a7a5138;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.9

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

diff --git a/queue-4.9/i2c-eg20t-load-module-automatically-if-id-matches.patch b/queue-4.9/i2c-eg20t-load-module-automatically-if-id-matches.patch
new file mode 100644
index 00000000000..a1e0e51b8f4
--- /dev/null
+++ b/queue-4.9/i2c-eg20t-load-module-automatically-if-id-matches.patch
@@ -0,0 +1,35 @@
+From 1dc636ac5847d0970187c81a086cf78533b42f78 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 2 Jul 2020 13:15:27 +0300
+Subject: i2c: eg20t: Load module automatically if ID matches
+
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+
+[ Upstream commit 5f90786b31fb7d1e199a8999d46c4e3aea672e11 ]
+
+The driver can't be loaded automatically because it misses
+module alias to be provided. Add corresponding MODULE_DEVICE_TABLE()
+call to the driver.
+
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Wolfram Sang <wsa@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/i2c/busses/i2c-eg20t.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
+index 5ce71ce7b6c43..39f05e784566d 100644
+--- a/drivers/i2c/busses/i2c-eg20t.c
++++ b/drivers/i2c/busses/i2c-eg20t.c
+@@ -189,6 +189,7 @@ static const struct pci_device_id pch_pcidev_id[] = {
+ 	{ PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7831_I2C), 1, },
+ 	{0,}
+ };
++MODULE_DEVICE_TABLE(pci, pch_pcidev_id);
+ 
+ static irqreturn_t pch_i2c_handler(int irq, void *pData);
+ 
+-- 
+2.25.1
+
diff --git a/queue-4.9/series b/queue-4.9/series
index 77d01b3d477..4527ce7647c 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -37,3 +37,4 @@ tcp-md5-do-not-send-silly-options-in-syncookies.patch
 tcp-md5-allow-changing-md5-keys-in-all-socket-states.patch
 cgroup-fix-cgroup_sk_alloc-for-sk_clone_lock.patch
 cgroup-fix-sock_cgroup_data-on-big-endian.patch
+i2c-eg20t-load-module-automatically-if-id-matches.patch