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

Commit c3001b77 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

net/ethernet: ks8851_mll unregister_netdev() before freeing 



We added another error condition here, but if we were to hit it then
we need to unregister_netdev() before doing the free_netdev().
Otherwise we would hit the BUG_ON() in free_netdev():

	BUG_ON(dev->reg_state != NETREG_UNREGISTERED);

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Tested-by: default avatarRaffaele Recalcati <raffaele.recalcati@bticino.it>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 69927fcc

drivers/net/ethernet/micrel/ks8851_mll.c

+3 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ static int __devinit ks8851_probe(struct platform_device *pdev) 
	if (!pdata) {

		netdev_err(netdev, "No platform data\n");

		err = -ENODEV;

		goto err_register;

		goto err_pdata;

	}

	memcpy(ks->mac_addr, pdata->mac_addr, 6);

	if (!is_valid_ether_addr(ks->mac_addr)) {
@@ -1626,6 +1626,8 @@ static int __devinit ks8851_probe(struct platform_device *pdev) 
		    (id >> 8) & 0xff, (id >> 4) & 0xf, (id >> 1) & 0x7);

	return 0;



err_pdata:

	unregister_netdev(netdev);

err_register:

err_get_irq:

	iounmap(ks->hw_addr_cmd);