Skip to content

Commit 23b33ac

Browse files
committed
Merge tag 'linux-watchdog-4.16-fixes-2' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck: - f71808e_wdt: Fix magic close handling - sbsa: 32-bit read fix for WCV - hpwdt: Remove legacy NMI sourcing * tag 'linux-watchdog-4.16-fixes-2' of git://www.linux-watchdog.org/linux-watchdog: watchdog: hpwdt: Remove legacy NMI sourcing. watchdog: sbsa: use 32-bit read for WCV watchdog: f71808e_wdt: Fix magic close handling
2 parents 91a2620 + 2b3d89b commit 23b33ac

File tree

3 files changed

+13
-494
lines changed

3 files changed

+13
-494
lines changed

drivers/watchdog/f71808e_wdt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,8 @@ static ssize_t watchdog_write(struct file *file, const char __user *buf,
566566
char c;
567567
if (get_user(c, buf + i))
568568
return -EFAULT;
569-
expect_close = (c == 'V');
569+
if (c == 'V')
570+
expect_close = true;
570571
}
571572

572573
/* Properly order writes across fork()ed processes */

0 commit comments

Comments
 (0)