Commit a407054f authored Feb 11, 2016 by Sascha Hauer Committed by David S. Miller Feb 16, 2016

net: dsa: remove phy_disconnect from error path



The phy has not been initialized, disconnecting it in the error
path results in a NULL pointer exception. Drop the phy_disconnect
from the error path.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bd16a724

net/dsa/slave.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1194,7 +1194,6 @@ int dsa_slave_create(struct dsa_switch ds, struct device parent,
	if (ret) {		if (ret) {
	netdev_err(master, "error %d registering interface %s\n",		netdev_err(master, "error %d registering interface %s\n",
	ret, slave_dev->name);		ret, slave_dev->name);
	phy_disconnect(p->phy);
	ds->ports[port] = NULL;		ds->ports[port] = NULL;
	free_netdev(slave_dev);		free_netdev(slave_dev);
	return ret;		return ret;