PCI / PM: Fix fallback to PCI_D0 in pci_platform_power_transition()

Message ID 48795235.crcTAaJqPb@vostro.rjw.lan
State Accepted
Headers show

Commit Message

Rafael J. Wysocki April 12, 2013, 11:58 p.m.
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Commit b51306c (PCI: Set device power state to PCI_D0 for device
without native PM support) modified pci_platform_power_transition()
by adding code causing dev->current_state for devices that don't
support native PCI PM but are power-manageable by the platform to be
changed to PCI_D0 regardless of the value returned by the preceding
platform_pci_set_power_state().  In particular, that also is done
if the platform_pci_set_power_state() has been successful, which
causes the correct power state of the device set by
pci_update_current_state() in that case to be overwritten by PCI_D0.

Fix that mistake by making the fallback to PCI_D0 only happen if
the platform_pci_set_power_state() has returned an error.

Reported-by: Chris J. Benenati <chris.j.benenati@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: <stable@vger.kernel.org>
 drivers/pci/pci.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Index: linux-pm/drivers/pci/pci.c
--- linux-pm.orig/drivers/pci/pci.c
+++ linux-pm/drivers/pci/pci.c
@@ -646,8 +646,7 @@  static int pci_platform_power_transition
 		error = platform_pci_set_power_state(dev, state);
 		if (!error)
 			pci_update_current_state(dev, state);
-		/* Fall back to PCI_D0 if native PM is not supported */
-		if (!dev->pm_cap)
+		else if (!dev->pm_cap) /* Fall back to PCI_D0 */
 			dev->current_state = PCI_D0;
 	} else {
 		error = -ENODEV;