Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 93e8a878ea95..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);
@@ -757,8 +757,6 @@ pci_scan_device(struct pci_bus *bus, int devfn)
         dev->dev.release = pci_release_dev;
         pci_dev_get(dev);
 
-        pci_name_device(dev);
-
         dev->dev.dma_mask = &dev->dma_mask;
         dev->dev.coherent_dma_mask = 0xffffffffull;