lkml.org 
[lkml]   [2009]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/5] watchdog: w83697ug, fix lock imbalance
Hi Jiri,

Will add this to the linux-2.6-watchdog trees.

Kind regards,
Wim.

> Don't forget to unlock io_lock when w83697ug_select_wd_register fails in
> wdt_ctrl.
>
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> ---
> drivers/watchdog/w83697ug_wdt.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/watchdog/w83697ug_wdt.c b/drivers/watchdog/w83697ug_wdt.c
> index 883b5f7..a6c12de 100644
> --- a/drivers/watchdog/w83697ug_wdt.c
> +++ b/drivers/watchdog/w83697ug_wdt.c
> @@ -149,8 +149,10 @@ static void wdt_ctrl(int timeout)
> {
> spin_lock(&io_lock);
>
> - if (w83697ug_select_wd_register() < 0)
> + if (w83697ug_select_wd_register() < 0) {
> + spin_unlock(&io_lock);
> return;
> + }
>
> outb_p(0xF4, WDT_EFER); /* Select CRF4 */
> outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF4 */
> --
> 1.6.3.2
>


\
 
 \ /
  Last update: 2009-06-29 21:25    [W:0.021 / U:13.092 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site