[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1480357509-28074-4-git-send-email-johan@kernel.org>
Date: Mon, 28 Nov 2016 19:24:56 +0100
From: Johan Hovold <johan@...nel.org>
To: "David S. Miller" <davem@...emloft.net>
Cc: Vince Bridgers <vbridger@...nsource.altera.com>,
Florian Fainelli <f.fainelli@...il.com>,
Fugang Duan <fugang.duan@....com>,
Pantelis Antoniou <pantelis.antoniou@...il.com>,
Vitaly Bordug <vbordug@...mvista.com>,
Claudiu Manoil <claudiu.manoil@...escale.com>,
Li Yang <leoli@...escale.com>,
Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>,
Felix Fietkau <nbd@...nwrt.org>,
John Crispin <blogic@...nwrt.org>,
Matthias Brugger <matthias.bgg@...il.com>,
Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
Lars Persson <lars.persson@...s.com>,
Mugunthan V N <mugunthanvnm@...com>,
Grygorii Strashko <grygorii.strashko@...com>,
Rob Herring <robh+dt@...nel.org>,
Frank Rowand <frowand.list@...il.com>,
Andrew Lunn <andrew@...n.ch>,
Vivien Didelot <vivien.didelot@...oirfairelinux.com>,
netdev@...r.kernel.org, nios2-dev@...ts.rocketboards.org,
linux-kernel@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
linux-mediatek@...ts.infradead.org,
linux-renesas-soc@...r.kernel.org, linux-omap@...r.kernel.org,
devicetree@...r.kernel.org, Johan Hovold <johan@...nel.org>
Subject: [PATCH net 03/16] net: ethernet: altera: fix fixed-link phydev leaks
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 <johan@...nel.org>
---
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);
--
2.7.3
Powered by blists - more mailing lists