2 files changed, 6 insertions, 8 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 3dcb83d7eb25..e179af3186f5 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -294,7 +294,7 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
                 return -EIO; 
 
         pci_read_config_word(dev,pm + PCI_PM_PMC,&pmc);
-        if ((pmc & PCI_PM_CAP_VER_MASK) > 2) {
+        if ((pmc & PCI_PM_CAP_VER_MASK) > 3) {
                 printk(KERN_DEBUG
                        "PCI: %s has unsupported PM cap regs version (%u)\n",
                        pci_name(dev), pmc & PCI_PM_CAP_VER_MASK);
@@ -302,12 +302,10 @@ pci_set_power_state(struct pci_dev *dev, pci_power_t state)
         }
 
         /* check if this device supports the desired state */
-        if (state == PCI_D1 || state == PCI_D2) {
-                if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1))
-                        return -EIO;
-                else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2))
-                        return -EIO;
-        }
+        if (state == PCI_D1 && !(pmc & PCI_PM_CAP_D1))
+                return -EIO;
+        else if (state == PCI_D2 && !(pmc & PCI_PM_CAP_D2))
+                return -EIO;
 
         pci_read_config_word(dev, pm + PCI_PM_CTRL, &pmcsr);
 
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 4be1b887ab62..b9c9b03919d4 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -584,7 +584,7 @@ static int pci_setup_device(struct pci_dev * dev)
                  dev->vendor, dev->device, class, dev->hdr_type);
 
         /* "Unknown power state" */
-        dev->current_state = 4;
+        dev->current_state = PCI_UNKNOWN;
 
         /* Early fixups, before probing the BARs */
         pci_fixup_device(pci_fixup_early, dev);