public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] watchdog: double lock typo in watchdog_nmi_enable_all()
@ 2015-05-20  7:44 Dan Carpenter
  2015-05-20  8:17 ` Ingo Molnar
  2015-05-20 11:19 ` Aaron Tomlin
  0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2015-05-20  7:44 UTC (permalink / raw)
  To: kernel-janitors

The mutex_lock() should obviously be mutex_unlock().

Fixes: ab992dc38f9a ('watchdog: Fix merge 'conflict'')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This bug is already in mainline.

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index c57e67d..a6ffa43 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -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)

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [patch] watchdog: double lock typo in watchdog_nmi_enable_all()
  2015-05-20  7:44 [patch] watchdog: double lock typo in watchdog_nmi_enable_all() Dan Carpenter
@ 2015-05-20  8:17 ` Ingo Molnar
  2015-05-20 11:19 ` Aaron Tomlin
  1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2015-05-20  8:17 UTC (permalink / raw)
  To: kernel-janitors


* Dan Carpenter <dan.carpenter@oracle.com> wrote:

> The mutex_lock() should obviously be mutex_unlock().
> 
> Fixes: ab992dc38f9a ('watchdog: Fix merge 'conflict'')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> This bug is already in mainline.
> 
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index c57e67d..a6ffa43 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -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 <mingo@kernel.org>

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [patch] watchdog: double lock typo in watchdog_nmi_enable_all()
  2015-05-20  7:44 [patch] watchdog: double lock typo in watchdog_nmi_enable_all() Dan Carpenter
  2015-05-20  8:17 ` Ingo Molnar
@ 2015-05-20 11:19 ` Aaron Tomlin
  1 sibling, 0 replies; 3+ messages in thread
From: Aaron Tomlin @ 2015-05-20 11:19 UTC (permalink / raw)
  To: kernel-janitors

On Wed 2015-05-20 10:44 +0300, Dan Carpenter wrote:
> The mutex_lock() should obviously be mutex_unlock().
> 
> Fixes: ab992dc38f9a ('watchdog: Fix merge 'conflict'')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> This bug is already in mainline.
> 
> diff --git a/kernel/watchdog.c b/kernel/watchdog.c
> index c57e67d..a6ffa43 100644
> --- a/kernel/watchdog.c
> +++ b/kernel/watchdog.c
> @@ -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 <atomlin@redhat.com>

-- 
Aaron Tomlin

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-05-20 11:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-20  7:44 [patch] watchdog: double lock typo in watchdog_nmi_enable_all() Dan Carpenter
2015-05-20  8:17 ` Ingo Molnar
2015-05-20 11:19 ` Aaron Tomlin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox