1 files changed, 24 insertions, 4 deletions

diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index c8062494009f..67c63d1f1582 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -245,16 +245,33 @@ EXPORT_SYMBOL(pci_osc_control_set);
  * currently we simply return _SxD, if present.
  */
 
-static int acpi_pci_choose_state(struct pci_dev *pdev, pm_message_t state)
+static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev,
+        pm_message_t state)
 {
-        /* TBD */
-
-        return -ENODEV;
+        int acpi_state;
+
+        acpi_state = acpi_pm_device_sleep_state(&pdev->dev,
+                device_may_wakeup(&pdev->dev), NULL);
+        if (acpi_state < 0)
+                return PCI_POWER_ERROR;
+
+        switch (acpi_state) {
+        case ACPI_STATE_D0:
+                return PCI_D0;
+        case ACPI_STATE_D1:
+                return PCI_D1;
+        case ACPI_STATE_D2:
+                return PCI_D2;
+        case ACPI_STATE_D3:
+                return PCI_D3hot;
+        }
+        return PCI_POWER_ERROR;
 }
 
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
         acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        acpi_handle tmp;
         static int state_conv[] = {
                 [0] = 0,
                 [1] = 1,
@@ -266,6 +283,9 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 
         if (!handle)
                 return -ENODEV;
+        /* If the ACPI device has _EJ0, ignore the device */
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
+                return 0;
         return acpi_bus_set_power(handle, acpi_state);
 }