[PATCH 11/18] pcmcia: pd6729: call disable_pci_device() if pci_probe() failed
in [Kernel]
|
Prev: [GIT] dmaengine/async_tx update for 2.6.36
Next: [PATCH 10/18] isdn: hisax: 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 pci_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/pcmcia/pd6729.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index b8a869a..1858c3a 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -646,7 +646,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, if (!pci_resource_start(dev, 0)) { dev_warn(&dev->dev, "refusing to load the driver as the " "io_base is NULL.\n"); - goto err_out_free_mem; + goto err_out_disable; } dev_info(&dev->dev, "Cirrus PD6729 PCI to PCMCIA Bridge at 0x%llx " @@ -666,7 +666,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, ret = pci_request_regions(dev, "pd6729"); if (ret) { dev_warn(&dev->dev, "pci request region failed.\n"); - goto err_out_disable; + goto err_out_free_mem; } if (dev->irq == NO_IRQ) -- 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/ |