Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beef9697 authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Greg Kroah-Hartman
Browse files

staging: rtl8187se: 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: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 036b00e0

drivers/staging/rtl8187se/r8180_core.c

+7 −3
Original line number Diff line number Diff line
@@ -3547,6 +3547,7 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 
	struct net_device *dev = NULL;

	struct r8180_priv *priv = NULL;

	u8 unit = 0;

	int ret = -ENODEV;



	unsigned long pmem_start, pmem_len, pmem_flags;
@@ -3561,8 +3562,10 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 
	pci_set_dma_mask(pdev, 0xffffff00ULL);

	pci_set_consistent_dma_mask(pdev, 0xffffff00ULL);

	dev = alloc_ieee80211(sizeof(struct r8180_priv));

	if (!dev)

		return -ENOMEM;

	if (!dev) {

		ret = -ENOMEM;

		goto fail_free;

	}

	priv = ieee80211_priv(dev);

	priv->ieee80211 = netdev_priv(dev);
@@ -3641,11 +3644,12 @@ static int __devinit rtl8180_pci_probe(struct pci_dev *pdev, 
		free_ieee80211(dev);

	}



fail_free:

	pci_disable_device(pdev);



	DMESG("wlan driver load failed\n");

	pci_set_drvdata(pdev, NULL);

	return -ENODEV;

	return ret;

}



static void __devexit rtl8180_pci_remove(struct pci_dev *pdev)