]> err.no Git - linux-2.6/commitdiff
[PATCH] pciehp: dont call pci_enable_dev
authorKristen Accardi <kristen.c.accardi@intel.com>
Mon, 24 Apr 2006 22:50:59 +0000 (15:50 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 19 Jun 2006 21:13:22 +0000 (14:13 -0700)
Don't call pci_enable_device from pciehp because the pcie port service driver
already does this.

Signed-off-by: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/hotplug/pciehp_hpc.c

index 7f459dfeadd3bb50c8768f448a91027f96042f97..081dfef4fe62e4e8866bab5633953bd3ebdacd0d 100644 (file)
@@ -1404,9 +1404,6 @@ int pcie_init(struct controller * ctrl, struct pcie_device *dev)
        info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, 
                pdev->subsystem_vendor, pdev->subsystem_device);
 
-       if (pci_enable_device(pdev))
-               goto abort_free_ctlr;
-       
        mutex_init(&ctrl->crit_sect);
        /* setup wait queue */
        init_waitqueue_head(&ctrl->queue);