Skip to contentSkip to conversation

PCI Hotplug: cpqphp: Add missing call to pci_disable_device

PATCH Applied Quentin Lambert 2 participants 2 messages Nov 19, 2016 – Nov 23, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI Hotplug: cpqphp: Add missing call to pci_disable_device

Most error branches following the call to pci_enable_device contain a call to pci_disable_device. This patch add these calls where they are missing.

This issue was found with Hector.

---
 drivers/pci/hotplug/cpqphp_core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/hotplug/cpqphp_core.c +2 -1
@@ -867,7 +867,8 @@ static int cpqhpc_probe(struct pci_dev *
 	 */
 	if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
 		err(msg_HPC_not_supported);
-		return -ENODEV;
+		rc = -ENODEV;
+		goto err_disable_device;
 	}
 
 	/* TODO: This code can be made to support non-Compaq or Intel
#1 lore raw
Quoted 7 lines · Quentin Lambert

Most error branches following the call to pci_enable_device contain a call to pci_disable_device. This patch add these calls where they are missing.

This issue was found with Hector.

Applied to pci/hotplug for v4.10, thanks, Quentin!

Quoted 20 lines
---
 drivers/pci/hotplug/cpqphp_core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/hotplug/cpqphp_core.c +2 -2
@@ -867,7 +867,8 @@ static int cpqhpc_probe(struct pci_dev *
 	 */
 	if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
 		err(msg_HPC_not_supported);
-		return -ENODEV;
+		rc = -ENODEV;
+		goto err_disable_device;
 	}
 
 	/* TODO: This code can be made to support non-Compaq or Intel
--

To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html