From patchwork Mon Nov 28 18:25:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700089 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tSFYR6t2Nz9vF6 for ; Tue, 29 Nov 2016 05:28:27 +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="gOnadTdx"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754414AbcK1S2N (ORCPT ); Mon, 28 Nov 2016 13:28:13 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34847 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753164AbcK1S1f (ORCPT ); Mon, 28 Nov 2016 13:27:35 -0500 Received: by mail-lf0-f67.google.com with SMTP id p100so10340879lfg.2; Mon, 28 Nov 2016 10:27:33 -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=qILMaPPZkvXrJBcNCYXW3t6yWcRl+kcY0Qel3kIxRds=; b=gOnadTdxpVedFyDoNCNUAcjQRMVO10eKJWimTt8u3ghUOqIowY3nwz62Kuj13RJiQO FUlkHp6QJtxBzPOrwx5hjhWAU/PZCSOhRiLAbeeJAbyKLeRvEDxEPfkrLRymfh0gWB9g vHqsXK9txdI+Hi7MajMMq+QmcfWIf/o9VVhKjeiJuiUVngzVGU9lXKBmNxD6kf/tyCij V0UhOvEyDazq/ML0xsLBDlfknubyMH4/c1bg78OGxqlI9nLI3Tb3Y7GvmRa6MtYqLvUf kN52bphqbHUGcYdmxwoy1K5456oLKOHg6iH57cz1fwoQ+MvXHYNZXrb4f4RrMEYhO5gY O3MA== 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=qILMaPPZkvXrJBcNCYXW3t6yWcRl+kcY0Qel3kIxRds=; b=QA2iwQeIjDs0vtjR9NKBdaWCJHskv1dBezTFCTnTQfihmPbtmHP/YqdgEHdVKjHwJU aSwuYJTQOFerrnLWY4WynTLT7X3TTm/Oalg8yNy6anPcjlrQv1HR0xvconwklOVR2hP8 ZeOTxGwRPSwrvpwlczocdPgmou8Jg4uAX5+DJZFphaz/Gtx86orWK0Wqm/p1GjsNP+yt rs02P1EZyHShOjC2csv/QjgP1gps+ob2VKGjzcwuTAp27HsHab10v2TWnP9kovqf2ww+ XvB52SVUnbgQtAbIzAaGwnig0yzOEeNBV2tSByGPqIhTFF+DjR9K+FtjCtGYDEi9Qsdq ogPQ== X-Gm-Message-State: AKaTC01Sj7R6zefHGYwr/4N6SJ5PaHGvmiwsEE2TO+X7qi1NeSCxpEGgL3ktSiMcBb7SgA== X-Received: by 10.25.17.27 with SMTP id g27mr7143569lfi.46.1480357652743; Mon, 28 Nov 2016 10:27:32 -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 v17sm13032599lja.43.2016.11.28.10.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:30 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeB-0007LA-23; Mon, 28 Nov 2016 19:27:23 +0100 From: Johan Hovold To: "David S. Miller" Cc: Vince Bridgers , Florian Fainelli , Fugang Duan , Pantelis Antoniou , Vitaly Bordug , Claudiu Manoil , Li Yang , Thomas Petazzoni , Felix Fietkau , John Crispin , Matthias Brugger , Sergei Shtylyov , Lars Persson , Mugunthan V N , Grygorii Strashko , Rob Herring , Frank Rowand , Andrew Lunn , Vivien Didelot , netdev@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-omap@vger.kernel.org, devicetree@vger.kernel.org, Johan Hovold Subject: [PATCH net 15/16] net: ethernet: ti: davinci_emac: fix fixed-link phydev and of-node leaks Date: Mon, 28 Nov 2016 19:25:08 +0100 Message-Id: <1480357509-28074-16-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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure to deregister and free any fixed-link PHY registered using of_phy_register_fixed_link() on probe errors and on driver unbind. Also remember to put the of-node reference on probe errors. Fixes: 1bb6aa56bb38 ("net: davinci_emac: Add support for fixed-link PHY") Signed-off-by: Johan Hovold --- drivers/net/ethernet/ti/davinci_emac.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 84fbe5714f8b..481c7bf0395b 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1767,6 +1767,7 @@ static int davinci_emac_try_get_mac(struct platform_device *pdev, */ static int davinci_emac_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; int rc = 0; struct resource *res, *res_ctrl; struct net_device *ndev; @@ -1805,7 +1806,7 @@ static int davinci_emac_probe(struct platform_device *pdev) if (!pdata) { dev_err(&pdev->dev, "no platform data\n"); rc = -ENODEV; - goto no_pdata; + goto err_free_netdev; } /* MAC addr and PHY mask , RMII enable info from platform_data */ @@ -1941,6 +1942,10 @@ static int davinci_emac_probe(struct platform_device *pdev) cpdma_chan_destroy(priv->rxchan); cpdma_ctlr_destroy(priv->dma); no_pdata: + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); + of_node_put(priv->phy_node); +err_free_netdev: free_netdev(ndev); return rc; } @@ -1956,6 +1961,7 @@ static int davinci_emac_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct emac_priv *priv = netdev_priv(ndev); + struct device_node *np = pdev->dev.of_node; dev_notice(&ndev->dev, "DaVinci EMAC: davinci_emac_remove()\n"); @@ -1968,6 +1974,8 @@ static int davinci_emac_remove(struct platform_device *pdev) unregister_netdev(ndev); of_node_put(priv->phy_node); pm_runtime_disable(&pdev->dev); + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); free_netdev(ndev); return 0;