From patchwork Mon Nov 28 18:25:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 9449931 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 571C960761 for ; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4DE8227F9C for ; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42C5227FB3; Mon, 28 Nov 2016 18:28:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA86327F9C for ; Mon, 28 Nov 2016 18:28:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754591AbcK1S2b (ORCPT ); Mon, 28 Nov 2016 13:28:31 -0500 Received: from mail-lf0-f67.google.com ([209.85.215.67]:33754 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857AbcK1S1d (ORCPT ); Mon, 28 Nov 2016 13:27:33 -0500 Received: by mail-lf0-f67.google.com with SMTP id 98so10306096lfs.0; Mon, 28 Nov 2016 10:27:31 -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=JxhG/SKj6hyFWZ6z3goANqOD3v4aGyUbxaqHO1Dwilc=; b=Yb4lkkbxcuXpJKxfGgv/xvCBYLR78uVEvjIIBKNgMb1vfOYRfUbJGcDdUrmOopofbK +xl7U17Nc2IUAoidpFDgn/4UOhV+rziKj1bdcgsqumHkpeABuh6biVvtGLouYskJPO9p iWm1pnBMOIIuQc1nn/kyNLAw55kLJnGgIXC6XHdNrWqe7yUOhT3C77pxKjAMn1JoAUir mVPM3Ek7IRpafpd+s7O32fAKe6F1MkmVcZUC8F/jfWT6Idfu4apg+/9GaGxQDl+siiSb Hlg8TbigQPW5XzXBIL1XGvXUlUT2Q+IRU+SfZTqiS5Q5fnvHifXujJllhdSj/YmdOZSG poBg== 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=JxhG/SKj6hyFWZ6z3goANqOD3v4aGyUbxaqHO1Dwilc=; b=GmABQ9PhDzLV2TSuMbNMG/KssU7aj8B+oS+hsTR9R7Geo/8HZyZ7S1EusurV8Jykir hb0ZkObZ3s89pJTBvD1S06TZV0KNjEhmTND4dbmeMNcYc5jP3p/6TLAOwaS/y4XMiFxu cjweb0L1QZFVQo2RjNbkb8fkLZ0ju6LWt+NY4Gmt57G/XubzdgJyQEfFJGZAr0abv8P3 wV8cZN8sTwckw/8qBEk+EQCVAV15pFYH5Stv9Q0t3UTlo/LWeigErEE/iuII2//rFVAK TgtB1ODRrskjgFBQiAi3i+zt5fx5t9JK9Xw9ddSz5+narJfd2yobX4QHHtdH4Qiz2GfV 0l1Q== X-Gm-Message-State: AKaTC02NdBitBHfqRhDwzobTUL5kndb8uw2Ii25BqaTWQQpKEyOIVnVZ/Fay46mhVtEnSQ== X-Received: by 10.46.5.140 with SMTP id 134mr10713308ljf.66.1480357650800; Mon, 28 Nov 2016 10:27:30 -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 e78sm13025870lfg.23.2016.11.28.10.27.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:27 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeA-0007KZ-Eo; Mon, 28 Nov 2016 19:27:22 +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 08/16] net: ethernet: fs_enet: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:25:01 +0100 Message-Id: <1480357509-28074-9-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: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: bb74d9a4a87b ("fs_enet: use the new fixed PHY helpers") Signed-off-by: Johan Hovold --- drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c index dc120c148d97..4b86260584a0 100644 --- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c @@ -980,7 +980,7 @@ static int fs_enet_probe(struct platform_device *ofdev) err = clk_prepare_enable(clk); if (err) { ret = err; - goto out_free_fpi; + goto out_deregister_fixed_link; } fpi->clk_per = clk; } @@ -1061,6 +1061,9 @@ static int fs_enet_probe(struct platform_device *ofdev) of_node_put(fpi->phy_node); if (fpi->clk_per) clk_disable_unprepare(fpi->clk_per); +out_deregister_fixed_link: + if (of_phy_is_fixed_link(ofdev->dev.of_node)) + of_phy_deregister_fixed_link(ofdev->dev.of_node); out_free_fpi: kfree(fpi); return ret; @@ -1079,6 +1082,8 @@ static int fs_enet_remove(struct platform_device *ofdev) of_node_put(fep->fpi->phy_node); if (fep->fpi->clk_per) clk_disable_unprepare(fep->fpi->clk_per); + if (of_phy_is_fixed_link(ofdev->dev.of_node)) + of_phy_deregister_fixed_link(ofdev->dev.of_node); free_netdev(ndev); return 0; }