diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-08 02:55:46 -0500 |
| commit | 6d3e0907b8b239d16720d144e2675ecf10d3bc3b (patch) | |
| tree | e0b0743b5f6f82b057cafc4f3687396a6e01a0b4 /drivers/net/sh_eth.c | |
| parent | 23577256953c870de9b724c3a2611ce7be6a1e4e (diff) | |
| parent | 50200df462023b187d80a99a52f5f2cfe3c86c26 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge reason: Merge dependent fix, update to latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/sh_eth.c')
| -rw-r--r-- | drivers/net/sh_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index ca6285016dfd..7402b858cab7 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
| @@ -110,7 +110,7 @@ static void sh_eth_reset(struct net_device *ndev) | |||
| 110 | mdelay(1); | 110 | mdelay(1); |
| 111 | cnt--; | 111 | cnt--; |
| 112 | } | 112 | } |
| 113 | if (cnt < 0) | 113 | if (cnt == 0) |
| 114 | printk(KERN_ERR "Device reset fail\n"); | 114 | printk(KERN_ERR "Device reset fail\n"); |
| 115 | 115 | ||
| 116 | /* Table Init */ | 116 | /* Table Init */ |