Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935135Ab0HFTtb (ORCPT ); Fri, 6 Aug 2010 15:49:31 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:54235 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750940Ab0HFTt0 (ORCPT ); Fri, 6 Aug 2010 15:49:26 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=C3UNLeebftO/FbImzXHxNAtSYHrIHwmQcK6OdAqeA5TCr6Zfxj418CBnAAc/8lUVFF yaFm502mhlM4TpdyfKV4rthH+IUXkYQFYBvMq0hi9dMUxigqVEXb1y9fdRbBzMKkxueD lf9U9MavBT6/SqChR+X85F4Q3B1DDibcfGo/k= 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] char: mxser: call disable_pci_device() if pci_probe() failed Date: Fri, 6 Aug 2010 23:49:17 +0400 Message-Id: <1281124159-12671-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: 1428 Lines: 49 Driver should call disable_pci_device() if it returns from pci_probe() with error. Also it must not be called if pci_request_region() fails as it means that somebody uses device resources and rules the device. Signed-off-by: Kulikov Vasiliy --- drivers/char/mxser.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index 3fc89da..3680eda 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c @@ -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; + } brd->vector = ioaddress; /* irq */ @@ -2616,10 +2619,11 @@ 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); + pci_release_region(pdev, 3); + 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/