diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 03:25:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 03:25:44 +0300 |
| commit | c6c88bbde4d8b2ffe9886b7130b2e23781d424e5 (patch) | |
| tree | 47c2b61983acc6fbc42d89813729b87bbaf2aed9 /drivers/usb/gadget/serial.c | |
| parent | 0356dbb7fe87ba59558902e536d9f960e87353c1 (diff) | |
| parent | c8dd7709c534ab0d713aa698c99132b6c812b57c (diff) | |
| download | linux-c6c88bbde4d8b2ffe9886b7130b2e23781d424e5.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/gadget/serial.c')
| -rw-r--r-- | drivers/usb/gadget/serial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c index b35ac6d334f8..65e084a2c87e 100644 --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c @@ -890,10 +890,12 @@ static void gs_close(struct tty_struct *tty, struct file *file) /* wait for write buffer to drain, or */ /* at most GS_CLOSE_TIMEOUT seconds */ if (gs_buf_data_avail(port->port_write_buf) > 0) { + spin_unlock_irqrestore(&port->port_lock, flags); wait_cond_interruptible_timeout(port->port_write_wait, port->port_dev == NULL || gs_buf_data_avail(port->port_write_buf) == 0, &port->port_lock, flags, GS_CLOSE_TIMEOUT * HZ); + spin_lock_irqsave(&port->port_lock, flags); } /* free disconnected port on final close */ |