diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-10-28 10:20:30 -0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-01 12:03:01 -0500 |
commit | f4444574a41430315a9c3eeb9e37cb0a36444a35 (patch) | |
tree | f7492f987408f52aaf1945e1442812d7bac9de87 /drivers/net | |
parent | 523e13455ec9ec4457a5a1d24ff7132949742b70 (diff) | |
download | op-kernel-dev-f4444574a41430315a9c3eeb9e37cb0a36444a35.zip op-kernel-dev-f4444574a41430315a9c3eeb9e37cb0a36444a35.tar.gz |
fec: Use gpio_set_value_cansleep()
We are in a context where we can sleep, and the FEC PHY reset gpio
may be on an I2C expander. Use the cansleep() variant when
setting the GPIO value.
Based on a patch from Russell King for pci-mvebu.c.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index dd4ca39..1de1a18 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3262,7 +3262,7 @@ static void fec_reset_phy(struct platform_device *pdev) return; } msleep(msec); - gpio_set_value(phy_reset, 1); + gpio_set_value_cansleep(phy_reset, 1); } #else /* CONFIG_OF */ static void fec_reset_phy(struct platform_device *pdev) |