Skip to contentSkip to conversation

staging: spectra: call disable_pci_device() if pci_probe() failed

PATCH Applied Kulikov Vasiliy 1 participant 1 message Aug 9, 2010

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

PATCH v2 18/18 staging: spectra: call disable_pci_device() if pci_probe() failed

Driver should call disable_pci_device() if it returns from pci_probe() with error.

---
 drivers/staging/spectra/lld_nand.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/staging/spectra/lld_nand.c +5 -2
index 13c3ad2..0d647a8 100644
@@ -2411,13 +2411,15 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	csr_base = pci_resource_start(dev, 0);
 	if (!csr_base) {
 		printk(KERN_ERR "Spectra: pci_resource_start failed!\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto failed_req_csr;
 	}
 
 	csr_len = pci_resource_len(dev, 0);
 	if (!csr_len) {
 		printk(KERN_ERR "Spectra: pci_resource_len failed!\n");
-		return -ENODEV;
+		ret = -ENODEV;
+		goto failed_req_csr;
 	}
 
 	ret = pci_request_regions(dev, SPECTRA_NAND_NAME);
@@ -2464,6 +2466,7 @@ static int nand_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 failed_remap_csr:
 	pci_release_regions(dev);
 failed_req_csr:
+	pci_disable_device(dev);
 
 	return ret;
 }
Signature · 1 line
1.7.0.4