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@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxx>
--
Aaron Tomlin
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
