From c00e9d95fa6feb4b720bf176afb344368e2cd89b Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Wed, 17 Aug 2005 15:32:19 -0700 Subject: [PATCH] --- yaml --- r: 7915 b: refs/heads/master c: 3fe9d19f9e86a55679f5f2b38ec0a43a1a510cee h: refs/heads/master i: 7913: d55de824ae08dc05f714975dbc870d7c1920c905 7911: b9a917f0e7c730d11c89ec8aebf1f78b554f2d82 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 12 +++++------- trunk/drivers/pci/probe.c | 2 +- trunk/include/linux/pci.h | 1 + 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 012f7006708b..c083842ef5ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cecf4864cf52a4a243a62b2856a6a155edbb55e8 +refs/heads/master: 3fe9d19f9e86a55679f5f2b38ec0a43a1a510cee diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 3dcb83d7eb25..e179af3186f5 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/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/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c index 4be1b887ab62..b9c9b03919d4 100644 --- a/trunk/drivers/pci/probe.c +++ b/trunk/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); diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index b0e244713281..7004dde7fef0 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -75,6 +75,7 @@ typedef int __bitwise pci_power_t; #define PCI_D2 ((pci_power_t __force) 2) #define PCI_D3hot ((pci_power_t __force) 3) #define PCI_D3cold ((pci_power_t __force) 4) +#define PCI_UNKNOWN ((pci_power_t __force) 5) #define PCI_POWER_ERROR ((pci_power_t __force) -1) /*