Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci (9160338d) · Commits · 戴 / test

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()

drivers/pci/pci-acpi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -266,8 +266,8 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
		}

		if (!error)
		dev_printk(KERN_INFO, &dev->dev,
		"power state changed by ACPI to D%d\n", state);
		dev_info(&dev->dev, "power state changed by ACPI to %s\n",
		pci_power_name(state));

		return error;
		}

drivers/pci/pci-driver.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message