[PATCH 12/18] staging: crystalhd: call disable_pci_device() if pci_probe() failed

Kulikov Vasiliy segooon at gmail.com
Fri Aug 6 12:52:50 PDT 2010


Driver should call disable_pci_device() if it returns from pci_probe()
with error. Also it must not be called if pci_request_region() fails as
it means that somebody uses device resources and rules the device.

Signed-off-by: Kulikov Vasiliy <segooon at gmail.com>
---
 drivers/staging/crystalhd/crystalhd_lnx.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index fbb80f0..0e52075 100644
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -570,6 +570,8 @@ static int __devinit chd_dec_pci_probe(struct pci_dev *pdev,
 	rc = chd_pci_reserve_mem(pinfo);
 	if (rc) {
 		BCMLOG_ERR("Failed to setup memory regions.\n");
+		if (rc != -EBUSY)
+			pci_disable_device(pdev);
 		return -ENOMEM;
 	}
 
-- 
1.7.0.4



More information about the devel mailing list