| Message ID | 20180521034947.469-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: phy: phylink: Don't release NULL GPIO | expand |
On Sun, May 20, 2018 at 08:49:47PM -0700, Florian Fainelli wrote: > 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> Andrew
From: Florian Fainelli <f.fainelli@gmail.com> Date: Sun, 20 May 2018 20:49:47 -0700 > 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> Applied.
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 581ce93ecaf9..af4dc4425be2 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -624,7 +624,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);
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> --- drivers/net/phy/phylink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)