From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 9 Aug 2010 09:50:37 +0000 (+0000)
Subject: isdn: avm: call pci_disable_device() if pci_probe() failed
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b69bcd9d9c3c47ed76da9cc0215c2eda0b7c16cf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

isdn: avm: call pci_disable_device() if pci_probe() failed

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

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 7715d3242ec8..d3530f6e8115 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1273,6 +1273,7 @@ static int __devinit c4_probe(struct pci_dev *dev,
 	if (retval != 0) {
 		printk(KERN_ERR "c4: no AVM-C%d at i/o %#x, irq %d detected, mem %#x\n",
 		       nr, param.port, param.irq, param.membase);
+		pci_disable_device(dev);
 		return -ENODEV;
 	}
 	return 0;