kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 01/18] char: moxa: call disable_pci_device() if pci_probe() failed
@ 2010-08-06 19:49 Kulikov Vasiliy
  2010-08-07  7:22 ` [PATCH 01/18] char: moxa: call disable_pci_device() if Dan Carpenter
  0 siblings, 1 reply; 6+ messages in thread
From: Kulikov Vasiliy @ 2010-08-06 19:49 UTC (permalink / raw)
  To: kernel-janitors
  Cc: Greg Kroah-Hartman, Alan Cox, Andrew Morton, Rakib Mullick,
	Ben Hutchings, linux-kernel

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.

Move pci_enable_device() after checking moxa_boards[] to remove senseless
pci_enable_device()/pci_disable_device().

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 drivers/char/moxa.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 107b0bd..0ea5aeb 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,6 +951,12 @@ 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");
@@ -1001,6 +1002,7 @@ err_base:
 	board->basemem = NULL;
 err_reg:
 	pci_release_region(pdev, 2);
+	pci_disable_device(pdev);
 err:
 	return retval;
 }
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-08-07 19:08 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-06 19:49 [PATCH 01/18] char: moxa: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy
2010-08-07  7:22 ` [PATCH 01/18] char: moxa: call disable_pci_device() if Dan Carpenter
2010-08-07  8:55   ` Vasiliy Kulikov
2010-08-07  9:58     ` Dan Carpenter
2010-08-07 18:02       ` Vasiliy Kulikov
2010-08-07 19:08         ` Dan Carpenter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).