kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 04/18 v2] char: sx: call disable_pci_device() if pci_probe() failed
@ 2010-08-09 19:49 Kulikov Vasiliy
  0 siblings, 0 replies; only message in thread
From: Kulikov Vasiliy @ 2010-08-09 19:49 UTC (permalink / raw)
  To: kernel-janitors; +Cc: Greg Kroah-Hartman, Arnd Bergmann, linux-kernel

Driver should call disable_pci_device() if it returns from pci_probe()
with error.

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

diff --git a/drivers/char/sx.c b/drivers/char/sx.c
index 5b24db4..759563e 100644
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
@@ -2678,7 +2678,7 @@ static int __devinit sx_pci_probe(struct pci_dev *pdev,
 	retval = pci_request_region(pdev, reg, "sx");
 	if (retval) {
 		dev_err(&pdev->dev, "can't request region\n");
-		goto err_flag;
+		goto err_disable;
 	}
 	board->hw_base = pci_resource_start(pdev, reg);
 	board->base2 @@ -2711,6 +2711,8 @@ err_unmap:
 	iounmap(board->base2);
 err_reg:
 	pci_release_region(pdev, reg);
+err_disable:
+	pci_disable_device(pdev);
 err_flag:
 	board->flags &= ~SX_BOARD_PRESENT;
 err:
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-08-09 19:49 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-09 19:49 [PATCH 04/18 v2] char: sx: call disable_pci_device() if pci_probe() failed Kulikov Vasiliy

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).