]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
watchdog: f71808e_wdt: Fix WD_EN register read
authorIgor Pylypiv <igor.pylypiv@gmail.com>
Wed, 7 Mar 2018 07:47:25 +0000 (23:47 -0800)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 6 Jun 2018 15:49:19 +0000 (11:49 -0400)
BugLink: http://bugs.launchpad.net/bugs/1773233
commit 977f6f68331f94bb72ad84ee96b7b87ce737d89d upstream.

F71808FG_FLAG_WD_EN defines bit position, not a bitmask

Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/watchdog/f71808e_wdt.c

index 8658dba2176816ed02d408081dfdca7e8b41bd99..e682bf046e5040b2620ebeda51b3d74e11dac60c 100644 (file)
@@ -496,7 +496,7 @@ static bool watchdog_is_running(void)
 
        is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0))
                && (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF)
-                       & F71808FG_FLAG_WD_EN);
+                       & BIT(F71808FG_FLAG_WD_EN));
 
        superio_exit(watchdog.sioaddr);