| Message ID | 1455763402-4399-1-git-send-email-f.fainelli@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Florian Fainelli <f.fainelli@gmail.com> Date: Wed, 17 Feb 2016 18:43:22 -0800 > 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> Applied, thanks Florian.
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 91e3b2ff364a..ab24521beb4d 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; }
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> --- Changes in v2: - fixed commit message to accurately reflect what we are doing s/unregister/free net/dsa/slave.c | 1 + 1 file changed, 1 insertion(+)