diff options
| author | Dmitry Artamonow <mad_soft@inbox.ru> | 2012-01-26 23:24:30 +0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-02-29 09:46:13 +0100 |
| commit | 741b9c7da1abf2f96f69d232fbeef5aff1371be3 (patch) | |
| tree | 935b65a517d1d7ea918fd9fc0ce0162f1f067eff | |
| parent | f599aaf00f6b5b35ea6af9e428eab8f894752efd (diff) | |
| download | linux-3.10-741b9c7da1abf2f96f69d232fbeef5aff1371be3.tar.gz linux-3.10-741b9c7da1abf2f96f69d232fbeef5aff1371be3.tar.bz2 linux-3.10-741b9c7da1abf2f96f69d232fbeef5aff1371be3.zip | |
watchdog: fix GETTIMEOUT ioctl in booke_wdt
Commit dcfb748422 ([WATCHDOG] fix book E watchdog to take
WDIOC_SETTIMEOUT arg in seconds) fixed SETTIMEOUT ioctl
to use seconds as a parameter instead of some hardware-specific
"period", but missed to apply similar changes to GETTIMEOUT,
so it still returns "period" value. Let's fix it!
Also, while at it, make SETTIMEOUT ioctl return real timeout
value as it should do according to the documentation.
Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
| -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 337265b4730..7c0fdfca264 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; } |