Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755454Ab0HITta (ORCPT ); Mon, 9 Aug 2010 15:49:30 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:45950 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754325Ab0HITt3 (ORCPT ); Mon, 9 Aug 2010 15:49:29 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=UXuvHoUXX26W8sgZ/dM5ryRlSYmLJkkPmko07eKg4QQ64ETYMz6CzDIQfUWFTV6fQm 4NGxuzIEAVizJ3d/pvCywm4efrrfi10XLf+JbIBtwiwxXoFxwDB+DcK5meqgCOcaBSJr KrCpp3MyN/3UX/cbJTmbOR9trOOs6VmBZVwqI= From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Greg Kroah-Hartman , Alan Cox , Andrew Morton , Rakib Mullick , Ben Hutchings , linux-kernel@vger.kernel.org Subject: [PATCH 01/18 v2] char: moxa: call disable_pci_device() if pci_probe() failed Date: Mon, 9 Aug 2010 23:49:20 +0400 Message-Id: <1281383362-13573-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: 1743 Lines: 66 Driver should call disable_pci_device() if it returns from pci_probe() with error. Signed-off-by: Kulikov Vasiliy --- drivers/char/moxa.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 107b0bd..4d81c2b 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -939,11 +939,6 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, int board_type = ent->driver_data; int retval; - retval = pci_enable_device(pdev); - if (retval) { - dev_err(&pdev->dev, "can't enable pci device\n"); - goto err; - } for (i = 0; i < MAX_BOARDS; i++) if (moxa_boards[i].basemem == NULL) @@ -956,16 +951,23 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev, goto err; } + retval = pci_enable_device(pdev); + if (retval) { + dev_err(&pdev->dev, "can't enable pci device\n"); + goto err; + } + board = &moxa_boards[i]; retval = pci_request_region(pdev, 2, "moxa-base"); if (retval) { dev_err(&pdev->dev, "can't request pci region 2\n"); - goto err; + goto err_disable; } board->basemem = ioremap_nocache(pci_resource_start(pdev, 2), 0x4000); if (board->basemem == NULL) { + retval = -ENOMEM; dev_err(&pdev->dev, "can't remap io space 2\n"); goto err_reg; } @@ -1001,6 +1003,8 @@ err_base: board->basemem = NULL; err_reg: pci_release_region(pdev, 2); +err_disable: + pci_disable_device(pdev); err: return retval; } -- 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/