diff options
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 4 |
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) | |||
584 | dev->vendor, dev->device, class, dev->hdr_type); | 584 | dev->vendor, dev->device, class, dev->hdr_type); |
585 | 585 | ||
586 | /* "Unknown power state" */ | 586 | /* "Unknown power state" */ |
587 | dev->current_state = 4; | 587 | dev->current_state = PCI_UNKNOWN; |
588 | 588 | ||
589 | /* Early fixups, before probing the BARs */ | 589 | /* Early fixups, before probing the BARs */ |
590 | pci_fixup_device(pci_fixup_early, dev); | 590 | pci_fixup_device(pci_fixup_early, dev); |
@@ -757,8 +757,6 @@ pci_scan_device(struct pci_bus *bus, int devfn) | |||
757 | dev->dev.release = pci_release_dev; | 757 | dev->dev.release = pci_release_dev; |
758 | pci_dev_get(dev); | 758 | pci_dev_get(dev); |
759 | 759 | ||
760 | pci_name_device(dev); | ||
761 | |||
762 | dev->dev.dma_mask = &dev->dma_mask; | 760 | dev->dev.dma_mask = &dev->dma_mask; |
763 | dev->dev.coherent_dma_mask = 0xffffffffull; | 761 | dev->dev.coherent_dma_mask = 0xffffffffull; |
764 | 762 | ||