diff options
| author | Olof Johansson | 2012-03-08 18:27:07 +0100 |
|---|---|---|
| committer | Olof Johansson | 2012-03-08 18:27:07 +0100 |
| commit | a58f67e70a6cad021ceebd1c8919b898dd5d5de3 (patch) | |
| tree | 78cb630cb31a8cbec17463f9acc0f766707c232f /drivers/watchdog/booke_wdt.c | |
| parent | Merge tag 'tegra-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/te... (diff) | |
| parent | Document: devicetree: add OF documents for arch-mmp (diff) | |
| download | kernel-qcow2-linux-a58f67e70a6cad021ceebd1c8919b898dd5d5de3.tar.gz kernel-qcow2-linux-a58f67e70a6cad021ceebd1c8919b898dd5d5de3.tar.xz kernel-qcow2-linux-a58f67e70a6cad021ceebd1c8919b898dd5d5de3.zip | |
Merge branch 'dt' of git://github.com/hzhuang1/linux into next/dt
* 'dt' of git://github.com/hzhuang1/linux: (6 commits)
Document: devicetree: add OF documents for arch-mmp
ARM: dts: append DTS file of pxa168
ARM: mmp: append OF support on pxa168
ARM: mmp: enable rtc clk in pxa168
i2c: pxa: add OF support
serial: pxa: add OF support
(plus update to v3.3-rc6)
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; } |