Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755544Ab0HITtj (ORCPT ); Mon, 9 Aug 2010 15:49:39 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:55443 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755480Ab0HITth (ORCPT ); Mon, 9 Aug 2010 15:49:37 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=GpQzYXuOr8GW0pxh92Dx64O9JrNLKU8kUCL/tfTuXKZN3J3gaP8PFyVWZlf5angSRL eDJeIIOZ19Jo8xvjG3/H/Q/oiw1cDNbUaYYzpDZNRCeC+0IG5OYIasgLzRtoZVPml+cD l2ZuZpr4/q4B2VbydFuse2XjceaZFzEu2CfBk= From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Jiri Slaby , Greg Kroah-Hartman , Alan Cox , Andrew Morton , Kulikov Vasiliy , linux-kernel@vger.kernel.org Subject: [PATCH 02/18 v2] char: mxser: call disable_pci_device() if pci_probe() failed Date: Mon, 9 Aug 2010 23:49:27 +0400 Message-Id: <1281383369-13613-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1653 Lines: 59 Driver should call disable_pci_device() if it returns from pci_probe() with error. Signed-off-by: Kulikov Vasiliy --- drivers/char/mxser.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 3fc89da..79009e2 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c @@ -2555,7 +2555,7 @@ static int __devinit mxser_probe(struct pci_dev *pdev, ioaddress = pci_resource_start(pdev, 2); retval = pci_request_region(pdev, 2, "mxser(IO)"); if (retval) - goto err; + goto err_disable; brd->info = &mxser_cards[ent->driver_data]; for (i = 0; i < brd->info->nports; i++) @@ -2564,8 +2564,11 @@ static int __devinit mxser_probe(struct pci_dev *pdev, /* vector */ ioaddress = pci_resource_start(pdev, 3); retval = pci_request_region(pdev, 3, "mxser(vector)"); - if (retval) - goto err_relio; + if (retval) { + pci_release_region(pdev, 2); + brd->info = NULL; + goto err_release; + } brd->vector = ioaddress; /* irq */ @@ -2616,10 +2619,13 @@ static int __devinit mxser_probe(struct pci_dev *pdev, pci_set_drvdata(pdev, brd); return 0; -err_relio: - pci_release_region(pdev, 2); err_null: brd->info = NULL; + pci_release_region(pdev, 2); +err_release: + pci_release_region(pdev, 3); +err_disable: + pci_disable_device(pdev); err: return retval; #else -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/