Re: [PATCH 1/5] watchdog: w83697ug, fix lock imbalance

[Wim Van Sebroeck]

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@xxxxxxxxx>
> ---
>  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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/