Prev: [PATCH 15/18] staging: rtl8187e: call disable_pci_device() if pci_probe() failed
Next: [PATCH 18/18] staging: spectra: call disable_pci_device() if pci_probe() failed
From: Kulikov Vasiliy on 6 Aug 2010 16:00 Driver should call disable_pci_device() if it returns from pci_probe() with error. Also it must not be called if request_region() fails as it means that somebody uses device resources and rules the device. Signed-off-by: Kulikov Vasiliy <segooon(a)gmail.com> --- drivers/char/stallion.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index f2167f8..abbe335 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c @@ -2151,7 +2151,7 @@ static int __devinit stl_pciprobe(struct pci_dev *pdev, brdp = stl_allocbrd(); if (brdp == NULL) { retval = -ENOMEM; - goto err; + goto err_disable; } mutex_lock(&stl_brdslock); brdnr = stl_getbrdnr(); @@ -2207,6 +2207,9 @@ err_null: stl_brds[brdp->brdnr] = NULL; err_fr: kfree(brdp); +err_disable: + if (retval != -EBUSY) + pci_disable_device(pdev); err: return retval; } -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |