From: Florian Fainelli <f.fainelli@gmail.com>
Date: Thu, 18 Feb 2016 02:43:22 +0000 (-0800)
Subject: net: dsa: Unregister slave_dev in error path
X-Git-Tag: v4.14-rc1~3787^2~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73dcb556538a4192222c3a919a51e1701bae553b;p=platform%2Fkernel%2Flinux-rpi.git

net: dsa: Unregister slave_dev in error path

With commit 0071f56e46da ("dsa: Register netdev before phy"), we are now trying
to free a network device that has been previously registered, and in case of
errors, this will make us hit the BUG_ON(dev->reg_state != NETREG_UNREGISTERED)
condition.

Fix this by adding a missing unregister_netdev() before free_netdev().

Fixes: 0071f56e46da ("dsa: Register netdev before phy")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 91e3b2f..ab24521 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1204,6 +1204,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
 	ret = dsa_slave_phy_setup(p, slave_dev);
 	if (ret) {
 		netdev_err(master, "error %d setting up slave phy\n", ret);
+		unregister_netdev(slave_dev);
 		free_netdev(slave_dev);
 		return ret;
 	}