From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751235AbcBKPjJ (ORCPT ); Thu, 11 Feb 2016 10:39:09 -0500 Received: from mail.savoirfairelinux.com ([208.88.110.44]:53676 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750812AbcBKPjI (ORCPT ); Thu, 11 Feb 2016 10:39:08 -0500 From: Vivien Didelot To: Sascha Hauer , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Andrew Lunn , Guenter Roeck , Sascha Hauer , narmstrong@baylibre.com Subject: Re: [PATCH 2/2] net: dsa: remove phy_disconnect from error path In-Reply-To: <1455187489-30771-2-git-send-email-s.hauer@pengutronix.de> References: <1455187489-30771-1-git-send-email-s.hauer@pengutronix.de> <1455187489-30771-2-git-send-email-s.hauer@pengutronix.de> User-Agent: Notmuch/0.21 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-unknown-linux-gnu) Date: Thu, 11 Feb 2016 10:39:03 -0500 Message-ID: <8737szi7e0.fsf@ketchup.mtl.sfl> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sascha, Sascha Hauer writes: > 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 > --- > net/dsa/slave.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index 40b9ca7..91e3b2f 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; I'm adding Neil in the loop, since he did some work similar to this, if I'm not mistaken. Thanks, -v