From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Subject: [PATCH 07/18] isdn: avm: call disable_pci_device() if pci_probe() failed Date: Fri, 6 Aug 2010 23:51:41 +0400 Message-ID: <1281124303-13537-1-git-send-email-segooon@gmail.com> Cc: Karsten Keil , "David S. Miller" , Alexey Dobriyan , Tilman Schmidt , netdev@vger.kernel.org To: kernel-janitors@vger.kernel.org Return-path: Received: from mail-ew0-f46.google.com ([209.85.215.46]:45182 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934053Ab0HFTvu (ORCPT ); Fri, 6 Aug 2010 15:51:50 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/isdn/hardware/avm/t1pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c index 5a3f830..e891ed6 100644 --- a/drivers/isdn/hardware/avm/t1pci.c +++ b/drivers/isdn/hardware/avm/t1pci.c @@ -210,6 +210,8 @@ static int __devinit t1pci_probe(struct pci_dev *dev, if (retval != 0) { printk(KERN_ERR "t1pci: no AVM-T1-PCI at i/o %#x, irq %d detected, mem %#x\n", param.port, param.irq, param.membase); + if (retval != -EBUSY) + pci_disable_device(dev); return -ENODEV; } return 0; -- 1.7.0.4