projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'hwmon-for-linus-v4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
drivers
/
watchdog
/
octeon-wdt-main.c
diff --git
a/drivers/watchdog/octeon-wdt-main.c
b/drivers/watchdog/octeon-wdt-main.c
index
14521c8
..
b55981f
100644
(file)
--- a/
drivers/watchdog/octeon-wdt-main.c
+++ b/
drivers/watchdog/octeon-wdt-main.c
@@
-431,7
+431,7
@@
static int octeon_wdt_cpu_callback(struct notifier_block *nfb,
{
unsigned int cpu = (unsigned long)hcpu;
- switch (action) {
+ switch (action
& ~CPU_TASKS_FROZEN
) {
case CPU_DOWN_PREPARE:
octeon_wdt_disable_interrupt(cpu);
break;