The patch titled
pci_set_power_state(): check for PM capabilities earlier
has been removed from the -mm tree. Its filename was
pci_set_power_state-check-for-pm-capabilities-earlier.patch
This patch was dropped because it isn't in the present -mm lineup
------------------------------------------------------
Subject: pci_set_power_state(): check for PM capabilities earlier
From: Andrew Lunn <andrew.lunn@xxxxxxxx>
Check for PCI_CAP_ID_PM before checking the device state. Apparently fixes
some log spam via the 3c59x driver.
Signed-off-by: Andrew Lunn <andrew.lunn@xxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/pci.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/pci/pci.c~pci_set_power_state-check-for-pm-capabilities-earlier drivers/pci/pci.c
--- a/drivers/pci/pci.c~pci_set_power_state-check-for-pm-capabilities-earlier
+++ a/drivers/pci/pci.c
@@ -406,6 +406,13 @@ pci_set_power_state(struct pci_dev *dev,
if ((state == PCI_D1 || state == PCI_D2) && pci_no_d1d2(dev))
return 0;
+ /* find PCI PM capability in list */
+ pm = pci_find_capability(dev, PCI_CAP_ID_PM);
+
+ /* abort if the device doesn't support PM capabilities */
+ if (!pm)
+ return -EIO;
+
/* Validate current state:
* Can enter D0 from any state, but if we can only go deeper
* to sleep if we're already in a low power state
@@ -418,13 +425,6 @@ pci_set_power_state(struct pci_dev *dev,
return 0; /* we're already there */
- /* find PCI PM capability in list */
- pm = pci_find_capability(dev, PCI_CAP_ID_PM);
-
- /* abort if the device doesn't support PM capabilities */
- if (!pm)
- return -EIO;
-
pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {
printk(KERN_DEBUG
_
Patches currently in -mm which might be from andrew.lunn@xxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
