evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tty: relock the mxser driver

Browse source 
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2009-01-02 13:45:58 +00:00 • committed by Linus Torvalds
parent c2ba38cd76
commit 3b6826b250
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/char/mxser.c
View file

@ -591,11 +591,11 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
retval = 0; retval = 0;
add_wait_queue(&port->open_wait, &wait); add_wait_queue(&port->open_wait, &wait);
spin_lock_irqsave(&mp->slock, flags); spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
port->count--; port->count--;
spin_unlock_irqrestore(&mp->slock, flags);
port->blocked_open++; port->blocked_open++;
spin_unlock_irqrestore(&port->lock, flags);
while (1) { while (1) {
tty_port_raise_dtr_rts(port); tty_port_raise_dtr_rts(port);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
@ -617,12 +617,13 @@ static int mxser_block_til_ready(struct tty_struct *tty, struct file *filp,
} }
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
remove_wait_queue(&port->open_wait, &wait); remove_wait_queue(&port->open_wait, &wait);
spin_lock_irqsave(&port->lock, flags);
if (!tty_hung_up_p(filp)) if (!tty_hung_up_p(filp))
port->count++; port->count++;
port->blocked_open--; port->blocked_open--;
if (retval) if (retval == 0)
return retval; port->flags |= ASYNC_NORMAL_ACTIVE;
port->flags |= ASYNC_NORMAL_ACTIVE; spin_unlock_irqrestore(&port->lock, flags);
return 0; return 0;
} }
@ -1102,9 +1103,9 @@ static int mxser_open(struct tty_struct *tty, struct file *filp)
/* /*
* Start up serial port * Start up serial port
*/ */
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->port.lock, flags);
info->port.count++; info->port.count++;
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->port.lock, flags);
retval = mxser_startup(tty); retval = mxser_startup(tty);
if (retval) if (retval)
return retval; return retval;
@ -1157,10 +1158,10 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
if (!info) if (!info)
return; return;
spin_lock_irqsave(&info->slock, flags); spin_lock_irqsave(&info->port.lock, flags);
if (tty_hung_up_p(filp)) { if (tty_hung_up_p(filp)) {
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->port.lock, flags);
return; return;
} }
if ((tty->count == 1) && (info->port.count != 1)) { if ((tty->count == 1) && (info->port.count != 1)) {
@ -1181,11 +1182,11 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
info->port.count = 0; info->port.count = 0;
} }
if (info->port.count) { if (info->port.count) {
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->port.lock, flags);
return; return;
} }
info->port.flags |= ASYNC_CLOSING; info->port.flags |= ASYNC_CLOSING;
spin_unlock_irqrestore(&info->slock, flags); spin_unlock_irqrestore(&info->port.lock, flags);
/* /*
* Save the termios structure, since this port may have * Save the termios structure, since this port may have
* separate termios for callout and dialin. * separate termios for callout and dialin.
@ -2161,10 +2162,7 @@ static void mxser_hangup(struct tty_struct *tty)
mxser_flush_buffer(tty); mxser_flush_buffer(tty);
mxser_shutdown(tty); mxser_shutdown(tty);
info->port.count = 0; tty_port_hangup(&info->port);
info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
tty_port_tty_set(&info->port, NULL);
wake_up_interruptible(&info->port.open_wait);
} }
/* /*