Skip to contentSkip to conversation

watchdog: double lock typo in watchdog_nmi_enable_all()

PATCH In review Dan Carpenter 3 participants 3 messages May 20, 2015 Kernel janitors

lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 watchdog: double lock typo in watchdog_nmi_enable_all()

The mutex_lock() should obviously be mutex_unlock().

Fixes ab992dc38f9a ('watchdog: Fix merge 'conflict'')
Signed-off-by Dan Carpenter <[email protected]>

---
This bug is already in mainline.

kernel/watchdog.c +1 -1
index c57e67d..a6ffa43 100644
@@ -628,7 +628,7 @@ void watchdog_nmi_enable_all(void)
 	put_online_cpus();
 
 unlock:
-	mutex_lock(&watchdog_proc_mutex);
+	mutex_unlock(&watchdog_proc_mutex);
 }
 
 void watchdog_nmi_disable_all(void)
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Dan Carpenter

The mutex_lock() should obviously be mutex_unlock().

Fixes ab992dc38f9a ('watchdog: Fix merge 'conflict'')
Signed-off-by Dan Carpenter <[email protected]>

---
This bug is already in mainline.

kernel/watchdog.c +0 -0
index c57e67d..a6ffa43 100644

kernel/watchdog.c void watchdog_nmi_enable_all(void) · line 634

Quoted 8 lines
kernel/watchdog.c +1 -1
@@ -628,7 +628,7 @@ void watchdog_nmi_enable_all(void)
 	put_online_cpus();
 
 unlock:
-	mutex_lock(&watchdog_proc_mutex);
+	mutex_unlock(&watchdog_proc_mutex);
 }
 
 void watchdog_nmi_disable_all(void)
Acked-by Ingo Molnar <[email protected]>

Thanks,

Ingo

Acked-by on v1 1/1
#2 lore raw
In reply to Dan Carpenter
Quoted 12 lines · Dan Carpenter

The mutex_lock() should obviously be mutex_unlock().

Fixes ab992dc38f9a ('watchdog: Fix merge 'conflict'')
Signed-off-by Dan Carpenter <[email protected]>

---
This bug is already in mainline.

kernel/watchdog.c +0 -0
index c57e67d..a6ffa43 100644

kernel/watchdog.c void watchdog_nmi_enable_all(void) · line 634

Quoted 8 lines
kernel/watchdog.c +1 -1
@@ -628,7 +628,7 @@ void watchdog_nmi_enable_all(void)
 	put_online_cpus();
 
 unlock:
-	mutex_lock(&watchdog_proc_mutex);
+	mutex_unlock(&watchdog_proc_mutex);
 }
 
 void watchdog_nmi_disable_all(void)
Acked-by Aaron Tomlin <[email protected]>
Signature · 1 line
Aaron Tomlin