1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 03fd59e80fef..1458fd69e670 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -499,7 +499,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
         return 0;
 }
 
-int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
+pci_power_t (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
  
 /**
  * pci_choose_state - Choose the power state of a PCI device
@@ -513,15 +513,15 @@ int (*platform_pci_choose_state)(struct pci_dev *dev, pm_message_t state);
 
 pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state)
 {
-        int ret;
+        pci_power_t ret;
 
         if (!pci_find_capability(dev, PCI_CAP_ID_PM))
                 return PCI_D0;
 
         if (platform_pci_choose_state) {
                 ret = platform_pci_choose_state(dev, state);
-                if (ret >= 0)
-                        state.event = ret;
+                if (ret != PCI_POWER_ERROR)
+                        return ret;
         }
 
         switch (state.event) {