From patchwork Mon Nov 28 18:24:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 700093 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 3tSFZW623Bz9vF6 for ; Tue, 29 Nov 2016 05:29:23 +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="s+GuWPUw"; 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 3tSFZW4vXszDvnv for ; Tue, 29 Nov 2016 05:29:23 +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="s+GuWPUw"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) (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 3tSFXL1CtVzDvhs for ; Tue, 29 Nov 2016 05:27:30 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s+GuWPUw"; dkim-atps=neutral Received: by mail-lf0-x243.google.com with SMTP id p100so10340561lfg.2 for ; Mon, 28 Nov 2016 10:27:30 -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=QPD/v3veThyazYbQpx077xdz4zadSm+mKG5AbQ2i8DQ=; b=s+GuWPUwZail0ZAKywloqPT3hoTnPYh/Cyy0Y7sfuB8Yqc1vQQaBI3Ji7B0ErXd3nu Xj1eXF1gSa0z0/6Q4Om8G/3nohtDFmR3oAz/rNoBYRk7p9yuJJHhWsitWUE5XC0LiOrF VA5Cs7JIGzbWmexJVHGV1tQJ7LLMDrDSNgu6HMrjte+gtCIzJYaEzj/YHXbQLypRMCxX bGW5lTr6CZ5j3lTuDTSjbiMl4td3bV3s0qyV5CbYh/TU01lmkxP7ocpptQ20gbLBTHKB LpCBNe4XLoMsprQiAldBPaFI7DKjIzoqO044g+c1M5yAzayYZw6ANw7GfcYLod9wF1I6 hZ7A== 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=QPD/v3veThyazYbQpx077xdz4zadSm+mKG5AbQ2i8DQ=; b=csr8l8EudE71CSC/yjyIAiFVks6Km6VRdKgazDuSEENKjXueY3uxRk0MayMhEauuCv YPLc8vbRL3sLDFwkX1qfj/zJ46L9LUbqlTmCTc8cizR+BkmmMjvISWRaIatYK/kflmD9 sxloNinM7tBnAqN0fg15s/iHaPSYmEYmMMlYczBIG2bh0Rge5zgvEYJUMFtlS/EfoqyZ T77Si0HEhhXDH+NNpLdUZz0WDWTkWTQy/1qMk658/JMdlNlilX2S7xANejRVWwcQrFes OvjOMdCCTir7t6W8QAoBunU8IzngvwZZwR0GV/n1GHb+e1Gbodoik2Xqv948P7PlRXxJ 4a1g== X-Gm-Message-State: AKaTC00oEYVjBI+RoldBOwJL2IUA/e7dvMn6VVjfv/GSgybMqw0NqzPpzdbaq9OVTPjnew== X-Received: by 10.46.78.10 with SMTP id c10mr11309784ljb.77.1480357647245; Mon, 28 Nov 2016 10:27:27 -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 w67sm12795365lff.16.2016.11.28.10.27.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 10:27:25 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1cBQeA-0007KA-2r; Mon, 28 Nov 2016 19:27:22 +0100 From: Johan Hovold To: "David S. Miller" Subject: [PATCH net 03/16] net: ethernet: altera: fix fixed-link phydev leaks Date: Mon, 28 Nov 2016 19:24:56 +0100 Message-Id: <1480357509-28074-4-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: 7cdbc6f74f8e ("altera tse: add support for fixed-links.") Signed-off-by: Johan Hovold --- drivers/net/ethernet/altera/altera_tse_main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c index bda31f308cc2..6532829b70d2 100644 --- a/drivers/net/ethernet/altera/altera_tse_main.c +++ b/drivers/net/ethernet/altera/altera_tse_main.c @@ -819,6 +819,8 @@ static int init_phy(struct net_device *dev) if (!phydev) { netdev_err(dev, "Could not find the PHY\n"); + if (fixed_link) + of_phy_deregister_fixed_link(priv->device->of_node); return -ENODEV; } @@ -1545,10 +1547,15 @@ static int altera_tse_probe(struct platform_device *pdev) static int altera_tse_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); + struct altera_tse_private *priv = netdev_priv(ndev); - if (ndev->phydev) + if (ndev->phydev) { phy_disconnect(ndev->phydev); + if (of_phy_is_fixed_link(priv->device->of_node)) + of_phy_deregister_fixed_link(priv->device->of_node); + } + platform_set_drvdata(pdev, NULL); altera_tse_mdio_destroy(ndev); unregister_netdev(ndev);