From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 20 Apr 2018 14:18:35 +0000 (+0200)
Subject: drop 4.9 i801 patch
X-Git-Tag: v3.18.106~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9af8193b1c40aec14efc896f009469f0de2f460;p=thirdparty%2Fkernel%2Fstable-queue.git

drop 4.9 i801 patch
---

diff --git a/queue-4.9/i2c-i801-restore-configuration-at-shutdown.patch b/queue-4.9/i2c-i801-restore-configuration-at-shutdown.patch
deleted file mode 100644
index b9f540ea410..00000000000
--- a/queue-4.9/i2c-i801-restore-configuration-at-shutdown.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f7f6d915a10f7f2bce17e3b1b7d3376562395a28 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Wed, 11 Apr 2018 18:05:34 +0200
-Subject: i2c: i801: Restore configuration at shutdown
-
-From: Jean Delvare <jdelvare@suse.de>
-
-commit f7f6d915a10f7f2bce17e3b1b7d3376562395a28 upstream.
-
-On some systems, the BIOS expects certain SMBus register values to
-match the hardware defaults. Restore these configuration registers at
-shutdown time to avoid confusing the BIOS. This avoids hard-locking
-such systems upon reboot.
-
-Signed-off-by: Jean Delvare <jdelvare@suse.de>
-Tested-by: Jason Andryuk <jandryuk@gmail.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/i2c/busses/i2c-i801.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/i2c/busses/i2c-i801.c
-+++ b/drivers/i2c/busses/i2c-i801.c
-@@ -1679,6 +1679,15 @@ static void i801_remove(struct pci_dev *
- 	 */
- }
- 
-+static void i801_shutdown(struct pci_dev *dev)
-+{
-+	struct i801_priv *priv = pci_get_drvdata(dev);
-+
-+	/* Restore config registers to avoid hard hang on some systems */
-+	i801_disable_host_notify(priv);
-+	pci_write_config_byte(dev, SMBHSTCFG, priv->original_hstcfg);
-+}
-+
- #ifdef CONFIG_PM
- static int i801_suspend(struct device *dev)
- {
-@@ -1711,6 +1720,7 @@ static struct pci_driver i801_driver = {
- 	.id_table	= i801_ids,
- 	.probe		= i801_probe,
- 	.remove		= i801_remove,
-+	.shutdown	= i801_shutdown,
- 	.driver		= {
- 		.pm	= &i801_pm_ops,
- 	},
diff --git a/queue-4.9/series b/queue-4.9/series
index 3aee7d69537..1ec22ed7500 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,4 +22,3 @@ usb-fix-usb3-devices-behind-usb3-hubs-not-resuming-at-hibernate-thaw.patch
 usb-dwc3-pci-properly-cleanup-resource.patch
 smb3-fix-root-directory-when-server-returns-inode-number-of-zero.patch
 hid-i2c-hid-fix-size-check-and-type-usage.patch
-i2c-i801-restore-configuration-at-shutdown.patch