queue-5.1/net-stmmac-fix-reset-gpio-free-missing.patch

   1 From foo@baz Fri 31 May 2019 03:16:39 PM PDT
   2 From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
   3 Date: Wed, 22 May 2019 10:05:09 +0000
   4 Subject: net: stmmac: fix reset gpio free missing
   5
   6 From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
   7
   8 [ Upstream commit 49ce881c0d4c4a7a35358d9dccd5f26d0e56fc61 ]
   9
  10 Commit 984203ceff27 ("net: stmmac: mdio: remove reset gpio free")
  11 removed the reset gpio free, when the driver is unbinded or rmmod,
  12 we miss the gpio free.
  13
  14 This patch uses managed API to request the reset gpio, so that the
  15 gpio could be freed properly.
  16
  17 Fixes: 984203ceff27 ("net: stmmac: mdio: remove reset gpio free")
  18 Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21 ---
  22  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c |    3 ++-
  23  1 file changed, 2 insertions(+), 1 deletion(-)
  24
  25 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
  26 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
  27 @@ -267,7 +267,8 @@ int stmmac_mdio_reset(struct mii_bus *bu
  28                         of_property_read_u32_array(np,
  29                                 "snps,reset-delays-us", data->delays, 3);
  30
  31 -                       if (gpio_request(data->reset_gpio, "mdio-reset"))
  32 +                       if (devm_gpio_request(priv->device, data->reset_gpio,
  33 +                                             "mdio-reset"))
  34                                 return 0;
  35                 }
  36