diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-12 23:26:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-14 10:00:39 -0700 |
| commit | 3696bb11f209a6d27ab278f66402ab4f4b889b3b (patch) | |
| tree | 1d215ebd8e8fb395be343387c169ba8f8346df07 /drivers/pci | |
| parent | c227ece753e0c8a31f0618e8edb4897d77f8fb0d (diff) | |
| download | kernel_samsung_smdk4412-3696bb11f209a6d27ab278f66402ab4f4b889b3b.zip kernel_samsung_smdk4412-3696bb11f209a6d27ab278f66402ab4f4b889b3b.tar.gz kernel_samsung_smdk4412-3696bb11f209a6d27ab278f66402ab4f4b889b3b.tar.bz2 | |
PCI: EHCI: Fix crash during hibernation on ASUS computers
commit 0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4 upstream.
Commit dbf0e4c (PCI: EHCI: fix crash during suspend on ASUS
computers) added a workaround for an ASUS suspend issue related to
USB EHCI and a bug in a number of ASUS BIOSes that attempt to shut
down the EHCI controller during system suspend if its PCI command
register doesn't contain 0 at that time.
It turns out that the same workaround is necessary in the analogous
hibernation code path, so add it.
References: https://bugzilla.kernel.org/show_bug.cgi?id=45811
Reported-and-tested-by: Oleksij Rempel <bug-track@fisher-privat.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 475a340..5d5bdf7 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -936,6 +936,13 @@ static int pci_pm_poweroff_noirq(struct device *dev) if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) pci_prepare_to_sleep(pci_dev); + /* + * The reason for doing this here is the same as for the analogous code + * in pci_pm_suspend_noirq(). + */ + if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) + pci_write_config_word(pci_dev, PCI_COMMAND, 0); + return 0; } |