From b5446e9fc006f3dc06a25d1c1c8883af32169998 Mon Sep 17 00:00:00 2001 From: Kristen Accardi Date: Mon, 24 Apr 2006 15:50:59 -0700 Subject: [PATCH] --- yaml --- r: 28255 b: refs/heads/master c: 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db h: refs/heads/master i: 28253: 0252f84f0d97873a076706fe676c3abe55818761 28251: abc161b281048c5307ee83806888a56425bbfccb 28247: 1507114d62e3cdaec9c55d2bad04006ca2b0fb02 28239: 93a623b6d5cec98c20262a66d52e905c8831dbf9 28223: d8094c8e4b17dd06decffb1f65b73cf2caab22f7 v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pciehp_hpc.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 833e4e0d2afc..c1d21f3caa79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81b26bcacd5df0f65344fb430b1bf7fe9cfbfe2a +refs/heads/master: 2433ee2654f0ac86f7886e5a8d01bee7f3c7c6db diff --git a/trunk/drivers/pci/hotplug/pciehp_hpc.c b/trunk/drivers/pci/hotplug/pciehp_hpc.c index 7f459dfeadd3..081dfef4fe62 100644 --- a/trunk/drivers/pci/hotplug/pciehp_hpc.c +++ b/trunk/drivers/pci/hotplug/pciehp_hpc.c @@ -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);