From patchwork Fri Aug 6 19:51:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 61148 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 4DB131007D1 for ; Sat, 7 Aug 2010 05:52:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965702Ab0HFTwL (ORCPT ); Fri, 6 Aug 2010 15:52:11 -0400 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 S935328Ab0HFTwH (ORCPT ); Fri, 6 Aug 2010 15:52:07 -0400 Received: by mail-ey0-f174.google.com with SMTP id 25so2921757eya.19 for ; Fri, 06 Aug 2010 12:52:06 -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=xIXCQ0kCFiqGRCbgi6sGDJ4/m7bLwnCaLfPl1mMMFYk=; b=nnMjli9ZB5RaW/bTk2ccT9bS0RAFMr2Tx5ySZ4Ed9nCoAhEX3y7a5s4f+i5IzrcHzC q3mgA5FBm+hSU2Ovp7bWm26Mo5gOovL73ugXBIQQNIK+J7ihovB3unRlKHQoCs00SgUb hH6NZIcBs6LqBcjamSGP6F2a3DZwif15RzVqY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=F4psaOVXOGZ12PLLY3Dc1Tf8Ca1P6JAymIVbc1o2EhiFnxg08AbDGlUUneLa6/DIDo V9S8nSxCXBwoxrLv1h6q5Zcj5U+K/zyjC+1n6OF5T0fvN5Eq+IG1ZfP3ZG3erUQAi96x 695f+RheXpi7S8MuQQXQmSZfhFbiAPYRZpVoU= Received: by 10.213.45.194 with SMTP id g2mr4697209ebf.0.1281124326520; Fri, 06 Aug 2010 12:52:06 -0700 (PDT) Received: from localhost (ppp91-78-210-54.pppoe.mtu-net.ru [91.78.210.54]) by mx.google.com with ESMTPS id a48sm2895594eei.13.2010.08.06.12.52.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 06 Aug 2010 12:52:06 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Karsten Keil , "David S. Miller" , Andrew Morton , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Peter Huewe , Tejun Heo , netdev@vger.kernel.org Subject: [PATCH 09/18] isdn: mISDN: call disable_pci_device() if pci_probe() failed Date: Fri, 6 Aug 2010 23:51:54 +0400 Message-Id: <1281124316-13626-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/mISDN/mISDNinfineon.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index d2dd61d..142744c 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c @@ -1094,6 +1094,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pr_info("mISDN: do not have informations about adapter at %s\n", pci_name(pdev)); kfree(card); + pci_disable_device(pdev); return -EINVAL; } else pr_notice("mISDN: found adapter %s at %s\n", @@ -1103,7 +1104,8 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_drvdata(pdev, card); err = setup_instance(card); if (err) { - pci_disable_device(card->pdev); + if (err != -EBUSY) + pci_disable_device(pdev); kfree(card); pci_set_drvdata(pdev, NULL); } else if (ent->driver_data == INF_SCT_1) { @@ -1114,6 +1116,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) sc = kzalloc(sizeof(struct inf_hw), GFP_KERNEL); if (!sc) { release_card(card); + pci_disable_device(pdev); return -ENOMEM; } sc->irq = card->irq; @@ -1121,6 +1124,8 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) sc->ci = card->ci + i; err = setup_instance(sc); if (err) { + if (err != -EBUSY) + pci_disable_device(pdev); kfree(sc); release_card(card); break;