diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-09-05 03:17:31 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-09-05 03:17:31 -0400 |
commit | 14e42917216ab0859827c2d8024df45a917301b4 (patch) | |
tree | efbea5d1c54387d62a6fd66a21560232cf312fda /drivers/pci/pci-driver.c | |
parent | 292f2b6254c9dbb98def6d3521b07a837545ead0 (diff) | |
parent | 4266274836e81575ee82498d84f4bd08ab7a7378 (diff) |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-next
Diffstat (limited to 'drivers/pci/pci-driver.c')
-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 185be3703343..5270f1a99328 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) | |||
959 | if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) | 959 | if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) |
960 | pci_prepare_to_sleep(pci_dev); | 960 | pci_prepare_to_sleep(pci_dev); |
961 | 961 | ||
962 | /* | ||
963 | * The reason for doing this here is the same as for the analogous code | ||
964 | * in pci_pm_suspend_noirq(). | ||
965 | */ | ||
966 | if (pci_dev->class == PCI_CLASS_SERIAL_USB_EHCI) | ||
967 | pci_write_config_word(pci_dev, PCI_COMMAND, 0); | ||
968 | |||
962 | return 0; | 969 | return 0; |
963 | } | 970 | } |
964 | 971 | ||