From patchwork Fri Aug 6 19:51:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 61146 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6963FB6EDD for ; Sat, 7 Aug 2010 05:51:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935083Ab0HFTvw (ORCPT ); Fri, 6 Aug 2010 15:51:52 -0400 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 Received: by ewy23 with SMTP id 23so2936778ewy.19 for ; Fri, 06 Aug 2010 12:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=Sug1w1G3b5oNK3hDVnaHDjpqddIHWUZ/TOk5VQ/HSFU=; b=wt/T86jROn8epJcGRHXdZzkArm2/ClqJIjGohoFThhIpB3ru0oyXWQpaIbV2C454Hu SEd+tCeftN6JAST+HRMobP4BBiGCpx0Kyg0QCmdmc3U2gdNnnIXjr70fuFGhoSfRsaTJ JY809b2Fgbjq0d+7PBQ2ELbKMpScNQnAIsIWQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=oJRhxUd9seAOIc9xabiRGTPLzLOov2fXxO8+Y9PTWN0bVya98W/L+KsKaWk+JCpugC trRm+3tVnRpeRK109H+0cfHM1+3fd86nprUFobWxCTrLVzVYHNkK76U6tO/otonVW2Ni zShmz7hf2lng3o3W0Y0sP5u8BsCWaswb5OZsc= Received: by 10.213.105.207 with SMTP id u15mr9151367ebo.83.1281124309025; Fri, 06 Aug 2010 12:51:49 -0700 (PDT) Received: from localhost (ppp91-78-210-54.pppoe.mtu-net.ru [91.78.210.54]) by mx.google.com with ESMTPS id v8sm2898336eeh.8.2010.08.06.12.51.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 06 Aug 2010 12:51:47 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Karsten Keil , "David S. Miller" , Alexey Dobriyan , Tilman Schmidt , netdev@vger.kernel.org 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> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;