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

Commit c1084e02 authored by Andrea Merello's avatar Andrea Merello Committed by John W. Linville
Browse files

rtl818x_pci: fix pci probe returns success when it fails 



There are several exit path from the PCI probe function.
Some of them, that are taken in case of errors, forget to set the "err"
variable, that is returned by the probe function.
This can lead to the kernel thinking the probe function succeeds while it
didn't, and this in turn causes extra calls to the "remove" function.

This patch fix this problem by ensuring "err" variable is assigned to a proper
non-zero value in each exit path.

Signed-off-by: default avatarAndrea Merello <andrea.merello@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f4cf6287

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

+4 −0
Original line number Diff line number Diff line
@@ -1756,6 +1756,7 @@ static int rtl8180_probe(struct pci_dev *pdev, 


	if (!priv->map) {

		dev_err(&pdev->dev, "Cannot map device memory/PIO\n");

		err = -ENOMEM;

		goto err_free_dev;

	}
@@ -1816,6 +1817,7 @@ static int rtl8180_probe(struct pci_dev *pdev, 
	default:

		printk(KERN_ERR "%s (rtl8180): Unknown chip! (0x%x)\n",

		       pci_name(pdev), reg >> 25);

		err = -ENODEV;

		goto err_iounmap;

	}
@@ -1866,12 +1868,14 @@ static int rtl8180_probe(struct pci_dev *pdev, 
	default:

		printk(KERN_ERR "%s (rtl8180): Unknown RF! (0x%x)\n",

		       pci_name(pdev), priv->rf_type);

		err = -ENODEV;

		goto err_iounmap;

	}



	if (!priv->rf) {

		printk(KERN_ERR "%s (rtl8180): %s RF frontend not supported!\n",

		       pci_name(pdev), rf_name);

		err = -ENODEV;

		goto err_iounmap;

	}