Thread (4 messages) flat view 4 messages, 2 authors, 2016-02-18

Re: [PATCH net] net: dsa: Unregister slave_dev in error path

From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2016-02-18 02:28:24

Le 17/02/2016 18:19, Florian Fainelli a écrit :
With commit 0071f56e46da ("dsa: Register netdev before phy"), we are now trying
to unregister
s/unregister/free/...

 a network device that has been previously registered, and in case
quoted hunk ↗ jump to hunk
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>
---
 net/dsa/slave.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 40b9ca7..e685042 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1205,6 +1205,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;
 	}

-- 
Florian
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help