[PATCH 04/18 v2] char: sx: call disable_pci_device() if pci_probe() failed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

Signed-off-by: Kulikov Vasiliy <segooon@xxxxxxxxx>
---
 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

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux