Merge branch 'v4.16-fixes'
This commit is contained in:
commit
1462eecfc5
|
@ -496,7 +496,7 @@ static bool watchdog_is_running(void)
|
||||||
|
|
||||||
is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0))
|
is_running = (superio_inb(watchdog.sioaddr, SIO_REG_ENABLE) & BIT(0))
|
||||||
&& (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF)
|
&& (superio_inb(watchdog.sioaddr, F71808FG_REG_WDT_CONF)
|
||||||
& F71808FG_FLAG_WD_EN);
|
& BIT(F71808FG_FLAG_WD_EN));
|
||||||
|
|
||||||
superio_exit(watchdog.sioaddr);
|
superio_exit(watchdog.sioaddr);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue