From patchwork Mon Nov 28 18:24:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700107 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 3tSFs763Wsz9vFb for ; Tue, 29 Nov 2016 05:42:03 +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="dQ0A2/yM"; 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 3tSFs74s2pzDw43 for ; Tue, 29 Nov 2016 05:42:03 +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="dQ0A2/yM"; 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 3tSFXN0zBdzDvhR 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="dQ0A2/yM"; dkim-atps=neutral Received: by mail-lf0-x241.google.com with SMTP id o20so10330321lfg.3 for ; 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=0zbZhBn/KyPwjbTLzV9sPDXpHLqdaOlqCDycGIVS3TQ=; b=dQ0A2/yMkGU++gfnF5mp1yI4w+2EEmo2LFGSwD0/oTvFeKqTY7qA+enfNl9f/NUZ6d A7ixODeWKu94drLYzxQBYEmkGLvQInGKGOwfrErkFXghUEine0zUFq1nSSiZ5fcqJpnt GM5VVh8caifKkfdBpdXFv4Hd20IqMBIZOiadoNwBS/+K2UEWgNtlNIQYxaE249cgQgbA 1h4XAegP7v7kqD+WPZNpD6DEqza1/0mYcix9S7EdccsxQ+9seDiir8aY5S/B+uSgja2d 869XSmr6byv1AfaHwdTOb2zhBDgy9xOp8VMHkJGEeDRdMTBaQk+pNczMRjKb6TAATOCq vCZQ== 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=0zbZhBn/KyPwjbTLzV9sPDXpHLqdaOlqCDycGIVS3TQ=; b=iQDMlOZ0zlQUlFjgy/SHH4k8qfGMzna2tvrkmZMU4feDxtg80yiQ6EXURKYsCPJVTq fF5/tFOuqbISU29aNB5CRAwNV7QWFUgstOw7RZRnEOJHf4wNl3S02kt/Zp+LekdY58GZ Asab2m3f3FdMBI/l4wVcRpOV25dnXaZZ8ztZk9aGOff9idu0Au2c8YGbn0/WTRyXgkkH gi+lJFP6DBwofI0Tiz7QEbrkFMXu56nVGlsb81pYrbv3qIMWQ+hRq8GKFGwMmh96hiYE +/pbQfCtF74j7KhK7OoIubgS/5Cgogmnq18EFTJbKmBlhnLP3VBcVz9dX3Fxv2fJpjPJ qoKQ== X-Gm-Message-State: AKaTC00KZGtdyIzQA31mpAVGHbeRNMPVdWDh9TSQ2geZI5HoWhJYxJ7hAK6ym8w9+irghQ== X-Received: by 10.25.75.213 with SMTP id y204mr6940374lfa.64.1480357649178; Mon, 28 Nov 2016 10:27:29 -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 z1sm13082954lja.27.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-0007KP-AM; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Subject: [PATCH net 06/16] net: ethernet: bcmgenet: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:24:59 +0100 Message-Id: <1480357509-28074-7-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. Note that we're still leaking any fixed-link PHY registered in the non-OF probe path. Fixes: 9abf0c2b717a ("net: bcmgenet: use the new fixed PHY helpers") Signed-off-by: Johan Hovold --- drivers/net/ethernet/broadcom/genet/bcmmii.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 2e745bd51df4..e87607621e62 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -627,6 +627,7 @@ static int bcmgenet_mii_bus_init(struct bcmgenet_priv *priv) int bcmgenet_mii_init(struct net_device *dev) { struct bcmgenet_priv *priv = netdev_priv(dev); + struct device_node *dn = priv->pdev->dev.of_node; int ret; ret = bcmgenet_mii_alloc(priv); @@ -640,6 +641,8 @@ int bcmgenet_mii_init(struct net_device *dev) return 0; out: + if (of_phy_is_fixed_link(dn)) + of_phy_deregister_fixed_link(dn); of_node_put(priv->phy_dn); mdiobus_unregister(priv->mii_bus); mdiobus_free(priv->mii_bus); @@ -649,7 +652,10 @@ int bcmgenet_mii_init(struct net_device *dev) void bcmgenet_mii_exit(struct net_device *dev) { struct bcmgenet_priv *priv = netdev_priv(dev); + struct device_node *dn = priv->pdev->dev.of_node; + if (of_phy_is_fixed_link(dn)) + of_phy_deregister_fixed_link(dn); of_node_put(priv->phy_dn); mdiobus_unregister(priv->mii_bus); mdiobus_free(priv->mii_bus);