projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d6591646 GKH |
1 | From 977f6f68331f94bb72ad84ee96b7b87ce737d89d Mon Sep 17 00:00:00 2001 |
| 2 | From: Igor Pylypiv <igor.pylypiv@gmail.com> | |
| 3 | Date: Tue, 6 Mar 2018 23:47:25 -0800 | |
| 4 | Subject: watchdog: f71808e_wdt: Fix WD_EN register read | |
| 5 | ||
| 6 | From: Igor Pylypiv <igor.pylypiv@gmail.com> | |
| 7 | ||
| 8 | commit 977f6f68331f94bb72ad84ee96b7b87ce737d89d upstream. | |
| 9 | ||
| 10 | F71808FG_FLAG_WD_EN defines bit position, not a bitmask | |
| 11 | ||
| 12 | Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com> | |
| 13 | Reviewed-by: Guenter Roeck <linux@roeck-us.net> | |
| 14 | Signed-off-by: Guenter Roeck <linux@roeck-us.net> | |
| 15 | Signed-off-by: Wim Van Sebroeck <wim@iguana.be> | |
| 16 | Cc: stable <stable@vger.kernel.org> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/watchdog/f71808e_wdt.c | 2 +- | |
| 21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 22 | ||
| 23 | --- a/drivers/watchdog/f71808e_wdt.c | |
| 24 | +++ b/drivers/watchdog/f71808e_wdt.c | |
| 25 | @@ -450,7 +450,7 @@ static bool watchdog_is_running(void) | |
| 26 | ||
| 27 | is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0)) | |
| 28 | && (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF) | |
| 29 | - & F71808FG_FLAG_WD_EN); | |
| 30 | + & BIT(F71808FG_FLAG_WD_EN)); | |
| 31 | ||
| 32 | superio_exit(watchdog.sioaddr); | |
| 33 |