Commit 1c76b490 authored Mar 18, 2016 by Jia-Ju Bai Committed by Kalle Valo Apr 07, 2016

rtl818x_pci: Disable pci device in error handling code



When pci_request_regions in rtl8180_probe fails, pci_disable_device is not
called to disable the device which is enabled by pci_enbale_device.

This patch fixes the problem by adding a new lable in error handling code.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Acked-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 96838d61

drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1736,7 +1736,7 @@ static int rtl8180_probe(struct pci_dev *pdev,
		if (err) {
		printk(KERN_ERR "%s (rtl8180): Cannot obtain PCI resources\n",
		pci_name(pdev));
		return err;
		goto err_disable_dev;
		}

		io_addr = pci_resource_start(pdev, 0);
		@@ -1938,6 +1938,8 @@ static int rtl8180_probe(struct pci_dev *pdev,

		err_free_reg:
		pci_release_regions(pdev);

		err_disable_dev:
		pci_disable_device(pdev);
		return err;
		}