From a16a81e3314b5bfa044dbc7e3f6ed187127cf409 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Wed, 30 Apr 2008 00:53:50 -0700
Subject: [PATCH] --- yaml --- r: 95205 b: refs/heads/master c:
 d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347 h: refs/heads/master i:   95203:
 8445fa99732ba92b3a2999d834403b1f8c7d666a v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/esp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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);