From: Harvey Harrison Date: Wed, 30 Apr 2008 07:53:50 +0000 (-0700) Subject: char: esp.c: fix possible double-unlock X-Git-Tag: v2.6.26-rc1~211 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347;p=linux-2.6-omap-h63xx.git char: esp.c: fix possible double-unlock Hitting either of the break statements in the while loop would cause a double-unlock of info->lock. [Jiri Slaby suggested simply returning is safe here, rather than a goto] Noticed by sparse: drivers/char/esp.c:2042:2: warning: context imbalance in 'rs_wait_until_sent' - unexpected unlock Signed-off-by: Harvey Harrison Cc: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 763d6d2e4b6..662e9cfdcc9 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c @@ -2040,10 +2040,10 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) msleep_interruptible(jiffies_to_msecs(char_time)); if (signal_pending(current)) - break; + return; if (timeout && time_after(jiffies, orig_jiffies + timeout)) - break; + return; spin_lock_irqsave(&info->lock, flags); serial_out(info, UART_ESI_CMD1, ESI_NO_COMMAND);