diff --git a/[refs] b/[refs] index 1e2a32e32e79..ddf79b653992 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5592268a5aa5e02f36f396de47c94a1506e3678 +refs/heads/master: d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347 diff --git a/trunk/drivers/char/esp.c b/trunk/drivers/char/esp.c index 763d6d2e4b62..662e9cfdcc96 100644 --- a/trunk/drivers/char/esp.c +++ b/trunk/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);