tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
"Here are two patches from Rafael Wysocki.

One fixes an EHCI-related hibernation crash on ASUS boxes. We fixed a
similar suspend issue in v3.6-rc1, and this applies the same fix to
the hibernate path.

The other fixes D3/D3cold/D4 messages related to the D3cold support we
merged in v3.6-rc1."

(Removed redundant top non-fast-forward merge commit from pulled branch)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: EHCI: Fix crash during hibernation on ASUS computers
PCI / PM: Fix D3/D3cold/D4 messages printed by acpi_pci_set_power_state()

Linus Torvalds 9160338d 3b31fe92

+9 -2
+2 -2
drivers/pci/pci-acpi.c
··· 266 266 } 267 267 268 268 if (!error) 269 - dev_printk(KERN_INFO, &dev->dev, 270 - "power state changed by ACPI to D%d\n", state); 269 + dev_info(&dev->dev, "power state changed by ACPI to %s\n", 270 + pci_power_name(state)); 271 271 272 272 return error; 273 273 }
+7
drivers/pci/pci-driver.c
··· 959 959 if (!pci_dev->state_saved && !pci_is_bridge(pci_dev)) 960 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 969 return 0; 963 970 } 964 971