From patchwork Mon Nov 28 18:25:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700109 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 3tSFwy5WRWz9vHL for ; Tue, 29 Nov 2016 05:45:22 +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="DX253rlR"; 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 3tSFwy1jSNzDw8L for ; Tue, 29 Nov 2016 05:45:22 +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="DX253rlR"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) (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 3tSFXN6hs0zDvhP for ; Tue, 29 Nov 2016 05:27:32 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DX253rlR"; dkim-atps=neutral Received: by mail-lf0-x242.google.com with SMTP id p100so10340740lfg.2 for ; Mon, 28 Nov 2016 10:27:32 -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=qOMPvIiKmptOndMFwVFx8+jeBJ5XOy4ganQoyzT/Heg=; b=DX253rlRSZGdvfMR+GBquKgic3Ih40/dlZQrYgDNgkCIM2TsGT+GMJ86FctaD0a8kz VHbomkd7cDyKfzXz3TDsxe9U/7So3EMgPGsNCiHlE6kfK9dpC30qFRxQjeHh3/rmvnzC dlrN+ZunT8Szp3Cp9yTALde5/5fdTwZ8w25U+Ytc3dz6ZerzSEThj36O0RvwJHjDv4IY FnP5KCbX64wx426QffLQNmlTbrocWy6A72LI0n5zQYMusokw66eJR27haPtijwklEiGf LBPdGsnYJxniEeQRUF/wCvC9ao85SqD3AfHgzXNJ11nMR/+l3zMTYCEVCeRxukHXW06e HpoA== 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=qOMPvIiKmptOndMFwVFx8+jeBJ5XOy4ganQoyzT/Heg=; b=cg86Wdpj+gEnn3w+vTg0LUM8akx8nUBMw1m9kI6NKGmNigRItsKk+qE3n86GTkhpgy 56aKOW4nnPZl6MorDb6e40ikjHa1LsTH+4hLcruxRu/UTSQ8rJx1eqgZZ4GwOqIEDNHb KSCyMT50rJT2xXzNhKc1E3wdBpMWz1Je4LPZxOcXs4tOkbANYIZBorTd1UF+H8Hlh2lB kfYdb+IlYNWdeY/apmy3fGrgi4l4JSm8xovJ6pRhjdBfMVLFAD9ur5g5eYSsv+MVP5dw sDAi4q+NtbV72Gv+d9rdioud0DyjsmtzpJGqmzW+plhlIRm+/6vYQBToTo1DnaKYtv2J 7cbQ== X-Gm-Message-State: AKaTC01BE9J7YQe5cvSQP9x7MqfqXEJJHahm61mjDpkPBQ5vOPcabWkDhsCITIlJwR7Euw== X-Received: by 10.25.219.69 with SMTP id s66mr7202485lfg.116.1480357650017; 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 u204sm12876668lja.5.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-0007KU-Cc; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Subject: [PATCH net 07/16] net: ethernet: fec: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:25:00 +0100 Message-Id: <1480357509-28074-8-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: 407066f8f371 ("net: fec: Support phys probed from devicetree and fixed-link") Signed-off-by: Johan Hovold --- drivers/net/ethernet/freescale/fec_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 5aa9d4ded214..74dcdf097348 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3475,6 +3475,8 @@ fec_probe(struct platform_device *pdev) failed_clk_ipg: fec_enet_clk_enable(ndev, false); failed_clk: + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); failed_phy: of_node_put(phy_node); failed_ioremap: @@ -3488,6 +3490,7 @@ fec_drv_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); + struct device_node *np = pdev->dev.of_node; cancel_work_sync(&fep->tx_timeout_work); fec_ptp_stop(pdev); @@ -3495,6 +3498,8 @@ fec_drv_remove(struct platform_device *pdev) fec_enet_mii_remove(fep); if (fep->reg_phy) regulator_disable(fep->reg_phy); + if (of_phy_is_fixed_link(np)) + of_phy_deregister_fixed_link(np); of_node_put(fep->phy_node); free_netdev(ndev);