8139too: Fix the lack of pci_disable_device

For linux-3.18.0
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 of disable_dev_on_err is not assigned 1.
This patch fix this problem.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 6d0b9df..d4b0a29 100644 (file)
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -787,10 +787,10 @@ static struct net_device *rtl8139_init_board(struct pci_dev *pdev)
        if (rc)
                goto err_out;
 
        if (rc)
                goto err_out;
 

+       disable_dev_on_err = 1;

        rc = pci_request_regions (pdev, DRV_NAME);
        if (rc)
                goto err_out;
        rc = pci_request_regions (pdev, DRV_NAME);
        if (rc)
                goto err_out;

-       disable_dev_on_err = 1;

 
        pci_set_master (pdev);
 
 
        pci_set_master (pdev);