char: sx: call disable_pci_device() if pci_probe() failed

PATCH Applied Kulikov Vasiliy 1 participant 1 message Aug 9, 2010

Subsystems (2)

Kernel janitors Char and misc drivers

lore

Share & tools

lore

Kulikov Vasiliy

author

2010-08-09 19:49 UTC #0 lore raw

PATCH v2 4/18 char: sx: call disable_pci_device() if pci_probe() failed

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

Signed-off-by Kulikov Vasiliy <[email protected]>

---
 drivers/char/sx.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

drivers/char/sx.c +1 -1

index 5b24db4..759563e 100644
@@ -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:

Signature · 1 line

1.7.0.4