From patchwork Mon Aug 9 19:50:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 61311 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 D31C9B6EFF for ; Tue, 10 Aug 2010 05:51:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755480Ab0HITvF (ORCPT ); Mon, 9 Aug 2010 15:51:05 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:45381 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755240Ab0HITvD (ORCPT ); Mon, 9 Aug 2010 15:51:03 -0400 Received: by ewy23 with SMTP id 23so3590162ewy.19 for ; Mon, 09 Aug 2010 12:51:01 -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=L+2NXDZbCG4VAbab7TQtvB/wgnfgcs7hmmQu1CBQwEQ=; b=G0Dte05pyTXjHYZ/fg2oTYqiL4PqyjzHKi7JZff2aPpe0JkqYm8xNNzMobsXvJ3hcx gyGtScsbQ9GRWA/oAYV0wRrymXqw5GRuv4xohJVfF9dFlLoaWKX011iRBfEN84jVma6A fmWj/KVVAopKRoqPhcfnpSijlUdAQNCc/94z8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=O1JuXBDITMXKLuOL9akT2u+4E93tnbQlsGdjf/c0WDPSRkow1VvUQw2COgJZJqMd6C 67SSrvCq3DMuGWgh7rpIBlkrvHijf612MPeFQP8QWeAx7aSpVjr9d4+PgDKzJNb0cQCa R5cwPIT9qbJCuxjrEhGi0B0QlMk7409mxAFvY= Received: by 10.213.54.140 with SMTP id q12mr3203850ebg.71.1281383461570; Mon, 09 Aug 2010 12:51:01 -0700 (PDT) Received: from localhost (ppp85-140-163-20.pppoe.mtu-net.ru [85.140.163.20]) by mx.google.com with ESMTPS id u9sm8375081eeh.17.2010.08.09.12.50.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 09 Aug 2010 12:51:01 -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 v2] isdn: mISDN: call disable_pci_device() if pci_probe() failed Date: Mon, 9 Aug 2010 23:50:53 +0400 Message-Id: <1281383456-14119-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. Signed-off-by: Kulikov Vasiliy --- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index d2dd61d..af25e1f 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,7 @@ 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); + pci_disable_device(pdev); kfree(card); pci_set_drvdata(pdev, NULL); } else if (ent->driver_data == INF_SCT_1) { @@ -1114,6 +1115,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 +1123,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) sc->ci = card->ci + i; err = setup_instance(sc); if (err) { + pci_disable_device(pdev); kfree(sc); release_card(card); break;