SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22037 from fbuihuu/watchdog-minor-improvements

Browse Source 
Watchdog minor improvements
This commit is contained in:
Yu Watanabe
2022-01-12 22:09:50 +09:00
committed by GitHub
parent edc6390e29 aac470326e
commit 174eab0066
4 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/watchdog.c
+5 -11
View File
@@ -156,9 +156,6 @@ int watchdog_set_device(const char *path) {
int r;
r = free_and_strdup(&watchdog_device, path);
if (r < 0)
return r;
if (r > 0) /* watchdog_device changed */
watchdog_fd = safe_close(watchdog_fd);
@@ -169,11 +166,9 @@ int watchdog_setup(usec_t timeout) {
usec_t previous_timeout;
int r;
/* timeout=0 closes the device whereas passing timeout=USEC_INFINITY
* opens it (if needed) without configuring any particular timeout and
* thus reuses the programmed value (therefore it's a nop if the device
* is already opened).
*/
/* timeout=0 closes the device whereas passing timeout=USEC_INFINITY opens it (if needed)
* without configuring any particular timeout and thus reuses the programmed value (therefore
* it's a nop if the device is already opened). */
if (timeout == 0) {
watchdog_close(true);
@@ -184,9 +179,8 @@ int watchdog_setup(usec_t timeout) {
if (watchdog_fd >= 0 && (timeout == watchdog_timeout || timeout == USEC_INFINITY))
return 0;
/* Initialize the watchdog timeout with the caller value. This value is
* going to be updated by update_timeout() with the closest value
* supported by the driver */
/* Initialize the watchdog timeout with the caller value. This value is going to be updated by
* update_timeout() with the closest value supported by the driver */
previous_timeout = watchdog_timeout;
watchdog_timeout = timeout;