diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-12 23:26:07 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-15 11:51:19 -0600 |
| commit | 0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4 (patch) | |
| tree | 4a33e793e42a741fac5098c564399813d580cc17 | |
| parent | 3d0882c0d10d4b4785aeaf26043e764e3aaca825 (diff) | |
| download | linux-3.10-0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4.tar.gz linux-3.10-0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4.tar.bz2 linux-3.10-0b68c8e2c3afaf9807eb1ebe0ccfb3b809570aa4.zip | |
PCI: EHCI: Fix crash during hibernation on ASUS computers
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>
Cc: stable@vger.kernel.org
| -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 185be370334..5270f1a9932 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -959,6 +959,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; } |