Subject: [PATCH v2 1/2] 8139too in linux-3.18.0: Fix the lack of pci_disable_device

From: Jia-Ju Bai <[email-masked]>
Date: Sun, 21 Dec 2014 15:36:43 +0800

When pci_request_regions is failed in rtl8139_init_board, 
pci_disable_device is not called to disable the device which are enabled 
by pci_enable_device, because disable_dev_on_err is not assigned 1.
This patch fix this problem.

Signed-off-by: Jia-Ju Bai <[email-masked]>
---
drivers/net/ethernet/realtek/8139too.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/realtek/8139too.c 
b/drivers/net/ethernet/realtek/8139too.c
index 007b38c..49bbcf3 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -783,10 +783,10 @@ static struct net_device 
*rtl8139_init_board(struct pci_dev *pdev)
if (rc)
goto err_out;

+ disable_dev_on_err = 1;
rc = pci_request_regions (pdev, DRV_NAME);
if (rc)
goto err_out;
- disable_dev_on_err = 1;

pci_set_master (pdev);