diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:29:28 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 05:29:28 -0400 |
| commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (patch) | |
| tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a /drivers/net/arm/ks8695net.c | |
| parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff) | |
| parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
Diffstat (limited to 'drivers/net/arm/ks8695net.c')
| -rw-r--r-- | drivers/net/arm/ks8695net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index 1cf2f949c0b4..f3a127434897 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
| @@ -560,7 +560,7 @@ ks8695_reset(struct ks8695_priv *ksp) | |||
| 560 | msleep(1); | 560 | msleep(1); |
| 561 | } | 561 | } |
| 562 | 562 | ||
| 563 | if (reset_timeout == 0) { | 563 | if (reset_timeout < 0) { |
| 564 | dev_crit(ksp->dev, | 564 | dev_crit(ksp->dev, |
| 565 | "Timeout waiting for DMA engines to reset\n"); | 565 | "Timeout waiting for DMA engines to reset\n"); |
| 566 | /* And blithely carry on */ | 566 | /* And blithely carry on */ |