summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jaremko <adam.jaremko@gmail.com>2011-04-28 07:41:18 +0000
committerDavid S. Miller <davem@davemloft.net>2011-04-29 12:41:59 -0700
commiteee9700c5dd8fbac517c8c1e85c60b688bc311a9 (patch)
treea714e66dfea1c9166d2b23f04c9000590593bd5c
parent686f13bb17784fbf8595a59ff4e4bd707d5ae66f (diff)
downloadop-kernel-dev-eee9700c5dd8fbac517c8c1e85c60b688bc311a9.zip
op-kernel-dev-eee9700c5dd8fbac517c8c1e85c60b688bc311a9.tar.gz
net: ftmac100: fix scheduling while atomic during PHY link status change
Signed-off-by: Adam Jaremko <adam.jaremko@gmail.com> Acked-by: Po-Yu Chuang <ratbert@faraday-tech.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ftmac100.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index a316619..9bd7746 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv)
* that hardware reset completed (what the f*ck).
* We still need to wait for a while.
*/
- usleep_range(500, 1000);
+ udelay(500);
return 0;
}
- usleep_range(1000, 10000);
+ udelay(1000);
}
netdev_err(netdev, "software reset failed\n");
@@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device *netdev, int phy_id, int reg)
if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
return phycr & FTMAC100_PHYCR_MIIRDATA;
- usleep_range(100, 1000);
+ udelay(100);
}
netdev_err(netdev, "mdio read timed out\n");
@@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device *netdev, int phy_id, int reg,
if ((phycr & FTMAC100_PHYCR_MIIWR) == 0)
return;
- usleep_range(100, 1000);
+ udelay(100);
}
netdev_err(netdev, "mdio write timed out\n");
OpenPOWER on IntegriCloud