Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 267315
b: refs/heads/master
c: 426929f
h: refs/heads/master
i:
  267313: 1988c24
  267311: 7e049dc
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent ac212a9 commit 1dbcebc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dfc97fcebd6a9a85335adcfc0e4d0a204bbaea35
refs/heads/master: 426929f8d3514d7f727b8c464d1eeeaf74b21519
3 changes: 3 additions & 0 deletions trunk/drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
* the line discipline to only process XON/XOFF characters by
* setting tty->closing.
*/
set_bit(ASYNCB_CLOSING, &port->flags);
tty->closing = 1;
spin_unlock_irqrestore(&port->lock, flags);

Expand Down Expand Up @@ -1335,8 +1336,10 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
* Wake up anyone trying to open this port.
*/
clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
clear_bit(ASYNCB_CLOSING, &port->flags);
spin_unlock_irqrestore(&port->lock, flags);
wake_up_interruptible(&port->open_wait);
wake_up_interruptible(&port->close_wait);

done:
mutex_unlock(&port->mutex);
Expand Down

0 comments on commit 1dbcebc

Please sign in to comment.