diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-06-05 23:54:01 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-11 02:28:48 -0700 |
| commit | 9f8c4265bda4a6e9aa97041d5cfd91386f460b65 (patch) | |
| tree | c3a00621d581f3f03ccb04305f2bd85e34541de0 /drivers/net/ethernet/renesas | |
| parent | 2786aae7fc935e44f81d5f359b6a768c81b46a9b (diff) | |
| download | op-kernel-dev-9f8c4265bda4a6e9aa97041d5cfd91386f460b65.zip op-kernel-dev-9f8c4265bda4a6e9aa97041d5cfd91386f460b65.tar.gz | |
sh_eth: fix result of sh_eth_check_reset() on timeout
When the first loop in sh_eth_check_reset() runs to its end, 'cnt' is 0, so the
following check for 'cnt < 0' fails to catch the timeout. Fix the condition in
this check, so that the timeout is actually reported.
While at it, fix the grammar in the failure message...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 42e9dd0..b4479b5 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -897,8 +897,8 @@ static int sh_eth_check_reset(struct net_device *ndev) mdelay(1); cnt--; } - if (cnt < 0) { - pr_err("Device reset fail\n"); + if (cnt <= 0) { + pr_err("Device reset failed\n"); ret = -ETIMEDOUT; } return ret; |
