]> git.proxmox.com Git - mirror_ubuntu-bionic-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)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1838700
[ 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: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

index ff2eeddf588e5631b632d53d13af634b5e3a6cd3..4c4298f1ebeed137580b65fb4bdae959a34210b1 100644 (file)
@@ -157,7 +157,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;
                }