Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95205
b: refs/heads/master
c: d3ceb65
h: refs/heads/master
i:
  95203: 8445fa9
v: v3
  • Loading branch information
Harvey Harrison authored and Linus Torvalds committed Apr 30, 2008
1 parent a95526a commit a16a81e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5592268a5aa5e02f36f396de47c94a1506e3678
refs/heads/master: d3ceb6562bfbe8f27fa32d1e24eea0e2d4de0347
4 changes: 2 additions & 2 deletions trunk/drivers/char/esp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a16a81e

Please sign in to comment.