diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-10 22:55:03 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-10 22:55:03 -0800 |
| commit | d4a66e752d0b19934dd208884f8605fe385aaaa9 (patch) | |
| tree | 72fb727be1d7636aae9cddfe9aa93ac9dec75daf /drivers/net/sh_eth.c | |
| parent | bdbec4b86ee99b020e159f9bd604003a3ae3b0ab (diff) | |
| parent | fa15e99b6bb44aa86b241a43ca8c509e91f80153 (diff) | |
| download | linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.tar.gz linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.tar.bz2 linux-d4a66e752d0b19934dd208884f8605fe385aaaa9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h
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 ed52c0063a65..42a35f086a9f 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) mdelay(1); cnt--; } - if (cnt < 0) + if (cnt == 0) printk(KERN_ERR "Device reset fail\n"); /* Table Init */ |