| From 30cbc64528ccdf4d0418929c9ad5441c84482841 Mon Sep 17 00:00:00 2001 |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| Date: Sun, 20 May 2018 20:49:47 -0700 |
| Subject: net: phy: phylink: Don't release NULL GPIO |
| |
| [ Upstream commit 3bcd47726c3b744fd08781795cca905cc59a1382 ] |
| |
| If CONFIG_GPIOLIB is disabled, gpiod_put() becomes a stub that produces a |
| warning, this helped identify that we could be attempting to release a NULL |
| pl->link_gpio GPIO descriptor, so guard against that. |
| |
| Fixes: daab3349ad1a ("net: phy: phylink: Release link GPIO") |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Reviewed-by: Andrew Lunn <andrew@lunn.ch> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/phy/phylink.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c |
| index e4a6ed88b9cf..79f28b9186c6 100644 |
| --- a/drivers/net/phy/phylink.c |
| +++ b/drivers/net/phy/phylink.c |
| @@ -561,7 +561,7 @@ void phylink_destroy(struct phylink *pl) |
| { |
| if (pl->sfp_bus) |
| sfp_unregister_upstream(pl->sfp_bus); |
| - if (!IS_ERR(pl->link_gpio)) |
| + if (!IS_ERR_OR_NULL(pl->link_gpio)) |
| gpiod_put(pl->link_gpio); |
| |
| cancel_work_sync(&pl->resolve); |
| -- |
| 2.17.1 |
| |
