From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kulikov Vasiliy Subject: [PATCH 06/18] isdn: avm: call disable_pci_device() if pci_probe() failed Date: Fri, 6 Aug 2010 23:51:35 +0400 Message-ID: <1281124297-13492-1-git-send-email-segooon@gmail.com> Cc: Karsten Keil , "David S. Miller" , Alexey Dobriyan , Tilman Schmidt , Tejun Heo , netdev@vger.kernel.org To: kernel-janitors@vger.kernel.org Return-path: Received: from mail-ey0-f174.google.com ([209.85.215.174]:64126 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969Ab0HFTvn (ORCPT ); Fri, 6 Aug 2010 15:51:43 -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/c4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index 7715d32..f255001 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c @@ -1273,6 +1273,8 @@ 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); + if (retval != -EBUSY) + pci_disable_device(dev); return -ENODEV; } return 0; -- 1.7.0.4