diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 18:25:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 18:25:13 +0100 |
| commit | cd3c1cde262b0f068d27d980648892b2843966d4 (patch) | |
| tree | b3c4433b39b790894836ac1fde2ee6d5f878e296 /drivers/watchdog/gef_wdt.c | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyt... (diff) | |
| parent | [WATCHDOG] orion5x_wdt.c: 'ORION5X_TCLK' undeclared (diff) | |
| download | linux-cd3c1cde262b0f068d27d980648892b2843966d4.tar.xz linux-cd3c1cde262b0f068d27d980648892b2843966d4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] orion5x_wdt.c: 'ORION5X_TCLK' undeclared
[WATCHDOG] gef_wdt.c: fsl_get_sys_freq() failure not noticed
[WATCHDOG] ks8695_wdt.c: 'CLOCK_TICK_RATE' undeclared
[WATCHDOG] rc32434_wdt: fix sections
[WATCHDOG] rc32434_wdt: fix watchdog driver
Diffstat (limited to 'drivers/watchdog/gef_wdt.c')
| -rw-r--r-- | drivers/watchdog/gef_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c index f0c2b7a1a175..734d9806a872 100644 --- a/drivers/watchdog/gef_wdt.c +++ b/drivers/watchdog/gef_wdt.c @@ -269,7 +269,7 @@ static int __devinit gef_wdt_probe(struct of_device *dev, bus_clk = 133; /* in MHz */ freq = fsl_get_sys_freq(); - if (freq > 0) + if (freq != -1) bus_clk = freq; /* Map devices registers into memory */ |