]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: phy: phylink: Don't release NULL GPIO
authorFlorian Fainelli <f.fainelli@gmail.com>
Mon, 21 May 2018 03:49:47 +0000 (20:49 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Nov 2018 13:52:45 +0000 (14:52 +0100)
[ 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

index e4a6ed88b9cf0253efdfd98a53aa7d9ec799f94d..79f28b9186c69c2cecd9e6817c1004fd32bc900a 100644 (file)
@@ -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);