]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net: stmmac: fix reset gpio free missing
authorJisheng Zhang <Jisheng.Zhang@synaptics.com>
Wed, 22 May 2019 10:05:09 +0000 (10:05 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837518
[ Upstream commit 49ce881c0d4c4a7a35358d9dccd5f26d0e56fc61 ]

Commit 984203ceff27 ("net: stmmac: mdio: remove reset gpio free")
removed the reset gpio free, when the driver is unbinded or rmmod,
we miss the gpio free.

This patch uses managed API to request the reset gpio, so that the
gpio could be freed properly.

Fixes: 984203ceff27 ("net: stmmac: mdio: remove reset gpio free")
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

index bdd351597b55251b35e17daf43aeff643912e33b..093a223fe40882cfdc8dae34f1a603034991a112 100644 (file)
@@ -267,7 +267,8 @@ int stmmac_mdio_reset(struct mii_bus *bus)
                        of_property_read_u32_array(np,
                                "snps,reset-delays-us", data->delays, 3);
 
-                       if (gpio_request(data->reset_gpio, "mdio-reset"))
+                       if (devm_gpio_request(priv->device, data->reset_gpio,
+                                             "mdio-reset"))
                                return 0;
                }