From 4fd09f900a218c3cb61a2b015b03dcbd6f96b600 Mon Sep 17 00:00:00 2001 From: Kulikov Vasiliy Date: Mon, 9 Aug 2010 23:52:06 +0400 Subject: [PATCH] staging: spectra: call disable_pci_device() if pci_probe() failed Driver should call disable_pci_device() if it returns from pci_probe() with error. Signed-off-by: Kulikov Vasiliy Signed-off-by: Greg Kroah-Hartman --- drivers/staging/spectra/lld_nand.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/staging/spectra/lld_nand.c b/drivers/staging/spectra/lld_nand.c index 13c3ad2db39..0d647a8fd2b 100644 --- a/drivers/staging/spectra/lld_nand.c +++ b/drivers/staging/spectra/lld_nand.c @@ -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; } -- 2.11.4.GIT