From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 11 Feb 2016 10:44:49 +0000 (+0100)
Subject: net: dsa: remove phy_disconnect from error path
X-Git-Tag: v4.5-rc6~35^2~52
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a407054f830ca9a28febdeeeaa34d2ed420b9ed3;p=uclinux-h8%2Flinux.git

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>
---

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 40b9ca72aae3..91e3b2ff364a 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1194,7 +1194,6 @@ int dsa_slave_create(struct dsa_switch *ds, struct device *parent,
 	if (ret) {
 		netdev_err(master, "error %d registering interface %s\n",
 			   ret, slave_dev->name);
-		phy_disconnect(p->phy);
 		ds->ports[port] = NULL;
 		free_netdev(slave_dev);
 		return ret;