From patchwork Mon Nov 28 18:24:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700104 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tSFl743wZz9vDw for ; Tue, 29 Nov 2016 05:36:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bSN8mbCv"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tSFl72YNrzDvtw for ; Tue, 29 Nov 2016 05:36:51 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bSN8mbCv"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tSFXK2pNqzDvhQ for ; Tue, 29 Nov 2016 05:27:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bSN8mbCv"; dkim-atps=neutral Received: by mail-lf0-x241.google.com with SMTP id o20so10330106lfg.3 for ; Mon, 28 Nov 2016 10:27:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mfo6c1AjKv19SRvILKUhu4iOeTzOTgtkexFA8v8WZ+U=; b=bSN8mbCvl9NqQ7zSHpqeksCl8zp9y4vNRZdqldsPSohEgYcAdjQe2m6W2g3/eoPk+n 1piXvOAtbA+3kz2MQfo6ayOo4RxP0brkkCWURKPD2dmHC71w7YtXlMClAZ5up/e2BACN GFs4gP+KLzgvGE+lzROcAmuPMu+aBWgGS+qZVJh2STzfiWDnRuZSkSMC6vXEA0ejwZff y41+luuYDAagvgE4YeCPMPIeEat4BhYmU+boM+a/HPXA27Tnrq2MwWyg+bJipR+Ix6Im /beHfmBJAL+Yp8quyjRElUh9YKlHIdCB7BKzh/UzofDPuU2BDQuus+o9g1xxGOo+njAM HBAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mfo6c1AjKv19SRvILKUhu4iOeTzOTgtkexFA8v8WZ+U=; b=er8NWS3VtkuDf/8eWX3X4UqL0H0C5+fTEsoBH5v5UzIuuci5o7wvz+DgSDM9X43jh6 te9+EfssUwDkmDHmVDksWDjfxAsEBpXV87/57wG1XQksQGUcKBeR+jis0dfBrz6BFG/m BiWEdOibbK5Zh1g+q7vz4aY7TJ6QWuxxTwjLCuUUlVfobB8w+jb3faL2YzSxrt0/Mzrd ch2EfV4XMhD7yl3bsnNj2v2j9NgON5WaCIvZ5x/PVe257DPi/vAm6QrlmQQXg/CHk9PT HFOMPu7rxezKTEUPVpIJ93PMw14g+vLRCT633RXu7OLybYpKqXLE6QQN2NVqQmwKkYM1 wxZw== X-Gm-Message-State: AKaTC03WHEzVoO0XDTMuBY97QZrR0yxvZTnQQCxZERFFCbf9EGns4jVApE/JEE2remqsyw== X-Received: by 10.25.92.131 with SMTP id u3mr8862232lfi.15.1480357646223; Mon, 28 Nov 2016 10:27:26 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id s189sm13138163lja.3.2016.11.28.10.27.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:26 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeA-0007KF-5k; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Subject: [PATCH net 04/16] net: ethernet: aurora: nb8800: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:24:57 +0100 Message-Id: <1480357509-28074-5-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1480357509-28074-1-git-send-email-johan@kernel.org> References: <1480357509-28074-1-git-send-email-johan@kernel.org> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , devicetree@vger.kernel.org, Frank Rowand , Felix Fietkau , Florian Fainelli , Claudiu Manoil , Mugunthan V N , Grygorii Strashko , linuxppc-dev@lists.ozlabs.org, Johan Hovold , Rob Herring , linux-mediatek@lists.infradead.org, Lars Persson , Matthias Brugger , linux-omap@vger.kernel.org, John Crispin , Thomas Petazzoni , Fugang Duan , Sergei Shtylyov , Vivien Didelot , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Vitaly Bordug , nios2-dev@lists.rocketboards.org, Vince Bridgers Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make sure to deregister and free any fixed-link PHY registered using of_phy_register_fixed_link() on probe errors and on driver unbind. Fixes: c7dfe3abf40e ("net: ethernet: nb8800: support fixed-link DT node") Signed-off-by: Johan Hovold --- drivers/net/ethernet/aurora/nb8800.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index 00c38bf151e6..e078d8da978c 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -1466,12 +1466,12 @@ static int nb8800_probe(struct platform_device *pdev) ret = nb8800_hw_init(dev); if (ret) - goto err_free_bus; + goto err_deregister_fixed_link; if (ops && ops->init) { ret = ops->init(dev); if (ret) - goto err_free_bus; + goto err_deregister_fixed_link; } dev->netdev_ops = &nb8800_netdev_ops; @@ -1504,6 +1504,9 @@ static int nb8800_probe(struct platform_device *pdev) err_free_dma: nb8800_dma_free(dev); +err_deregister_fixed_link: + if (of_phy_is_fixed_link(pdev->dev.of_node)) + of_phy_deregister_fixed_link(pdev->dev.of_node); err_free_bus: of_node_put(priv->phy_node); mdiobus_unregister(bus); @@ -1521,6 +1524,8 @@ static int nb8800_remove(struct platform_device *pdev) struct nb8800_priv *priv = netdev_priv(ndev); unregister_netdev(ndev); + if (of_phy_is_fixed_link(pdev->dev.of_node)) + of_phy_deregister_fixed_link(pdev->dev.of_node); of_node_put(priv->phy_node); mdiobus_unregister(priv->mii_bus);