diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-01-19 09:53:43 -0500 |
| commit | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (patch) | |
| tree | 21d6b8168670f22521f3bb703e3b9d1932566c1c /drivers/net/sh_eth.c | |
| parent | d2f2fcd2541bae004db7f4798ffd9d2cb75ae817 (diff) | |
| parent | 3fb4a508b8e7957aa899f32cd6d9d462e102c7ca (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
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 */ |