|
@@ -7029,8 +7029,12 @@ static void hpsa_free_pci_init(struct ctlr_info *h)
|
|
|
iounmap(h->vaddr); /* pci_init 3 */
|
|
|
h->vaddr = NULL;
|
|
|
hpsa_disable_interrupt_mode(h); /* pci_init 2 */
|
|
|
- pci_release_regions(h->pdev); /* pci_init 2 */
|
|
|
+ /*
|
|
|
+ * call pci_disable_device before pci_release_regions per
|
|
|
+ * Documentation/PCI/pci.txt
|
|
|
+ */
|
|
|
pci_disable_device(h->pdev); /* pci_init 1 */
|
|
|
+ pci_release_regions(h->pdev); /* pci_init 2 */
|
|
|
}
|
|
|
|
|
|
/* several items must be freed later */
|
|
@@ -7053,6 +7057,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
|
|
|
err = pci_enable_device(h->pdev);
|
|
|
if (err) {
|
|
|
dev_err(&h->pdev->dev, "failed to enable PCI device\n");
|
|
|
+ pci_disable_device(h->pdev);
|
|
|
return err;
|
|
|
}
|
|
|
|
|
@@ -7060,7 +7065,8 @@ static int hpsa_pci_init(struct ctlr_info *h)
|
|
|
if (err) {
|
|
|
dev_err(&h->pdev->dev,
|
|
|
"failed to obtain PCI resources\n");
|
|
|
- goto clean1; /* pci */
|
|
|
+ pci_disable_device(h->pdev);
|
|
|
+ return err;
|
|
|
}
|
|
|
|
|
|
pci_set_master(h->pdev);
|
|
@@ -7101,9 +7107,12 @@ clean3: /* vaddr, intmode+region, pci */
|
|
|
h->vaddr = NULL;
|
|
|
clean2: /* intmode+region, pci */
|
|
|
hpsa_disable_interrupt_mode(h);
|
|
|
- pci_release_regions(h->pdev);
|
|
|
-clean1: /* pci */
|
|
|
+ /*
|
|
|
+ * call pci_disable_device before pci_release_regions per
|
|
|
+ * Documentation/PCI/pci.txt
|
|
|
+ */
|
|
|
pci_disable_device(h->pdev);
|
|
|
+ pci_release_regions(h->pdev);
|
|
|
return err;
|
|
|
}
|
|
|
|