diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-01 18:27:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-01 18:27:43 -0800 |
| commit | 1f033c1a6ec1a6815e9c4507d83eb20161163c37 (patch) | |
| tree | ef2f12d633a231d341c9bbd1b75b0cf22c21d67d /drivers/watchdog/booke_wdt.c | |
| parent | 13fb2d10371581f42c81da54ef7a1e1a9dfe6d46 (diff) | |
| parent | 741b9c7da1abf2f96f69d232fbeef5aff1371be3 (diff) | |
| download | kernel_replicant_linux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.tar.gz kernel_replicant_linux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.tar.bz2 kernel_replicant_linux-1f033c1a6ec1a6815e9c4507d83eb20161163c37.zip | |
Merge git://www.linux-watchdog.org/linux-watchdog
Watchdog updates from Wim Van Sebroeck:
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: fix GETTIMEOUT ioctl in booke_wdt
watchdog: update maintainers git entry
watchdog: Fix typo in pnx4008_wdt.c
watchdog: Fix typo in Kconfig
watchdog: fix error in probe() of s3c2410_wdt (reset at booting)
watchdog: hpwdt: clean up set_memory_x call for 32 bit
Diffstat (limited to 'drivers/watchdog/booke_wdt.c')
| -rw-r--r-- | drivers/watchdog/booke_wdt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 337265b47305..7c0fdfca2646 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -198,9 +198,13 @@ static long booke_wdt_ioctl(struct file *file, booke_wdt_period = tmp; #endif booke_wdt_set(); - return 0; + /* Fall */ case WDIOC_GETTIMEOUT: +#ifdef CONFIG_FSL_BOOKE + return put_user(period_to_sec(booke_wdt_period), p); +#else return put_user(booke_wdt_period, p); +#endif default: return -ENOTTY; } |