watchdog: really return the actual watchdog timeout

In the current code setting the return argument is never reached.
This commit is contained in:
Michael Olbrich
2012-04-10 22:32:30 +02:00
committed by Lennart Poettering
parent 771f19c06a
commit 56bcbfa5f8
+5 -2
View File
@@ -98,6 +98,7 @@ static int open_watchdog(void) {
}
int watchdog_set_timeout(usec_t *usec) {
int r;
watchdog_timeout = *usec;
@@ -107,11 +108,13 @@ int watchdog_set_timeout(usec_t *usec) {
return 0;
if (watchdog_fd < 0)
return open_watchdog();
r = open_watchdog();
else
return update_timeout();
r = update_timeout();
*usec = watchdog_timeout;
return r;
}
int watchdog_ping(void) {