Просмотр исходного кода

PCI: 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().  Add these calls where they are missing.

This issue was found with Hector.

Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Quentin Lambert 8 лет назад
Родитель
Сommit
b11d207fb2
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      drivers/pci/hotplug/cpqphp_core.c

+ 2 - 1
drivers/pci/hotplug/cpqphp_core.c

@@ -867,7 +867,8 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	 */
 	 */
 	if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
 	if ((pdev->revision <= 2) && (vendor_id != PCI_VENDOR_ID_INTEL)) {
 		err(msg_HPC_not_supported);
 		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
 	/* TODO: This code can be made to support non-Compaq or Intel