Commit 741b9c7d authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Wim Van Sebroeck

watchdog: fix GETTIMEOUT ioctl in booke_wdt

Commit dcfb7484 ([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: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent f599aaf0
...@@ -198,9 +198,13 @@ static long booke_wdt_ioctl(struct file *file, ...@@ -198,9 +198,13 @@ static long booke_wdt_ioctl(struct file *file,
booke_wdt_period = tmp; booke_wdt_period = tmp;
#endif #endif
booke_wdt_set(); booke_wdt_set();
return 0; /* Fall */
case WDIOC_GETTIMEOUT: 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); return put_user(booke_wdt_period, p);
#endif
default: default:
return -ENOTTY; return -ENOTTY;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment