[PATCH] Char: mxser_new, lock count and flags
Both open count and INITIALIZED flag should be changed under lock. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: <osv@javad.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
722d5e4ae8
commit
5ff7205dd9
1 changed files with 4 additions and 1 deletions
|
@ -853,9 +853,9 @@ static int mxser_startup(struct mxser_port *info)
|
||||||
* and set the speed of the serial port
|
* and set the speed of the serial port
|
||||||
*/
|
*/
|
||||||
mxser_change_speed(info, NULL);
|
mxser_change_speed(info, NULL);
|
||||||
|
info->flags |= ASYNC_INITIALIZED;
|
||||||
spin_unlock_irqrestore(&info->slock, flags);
|
spin_unlock_irqrestore(&info->slock, flags);
|
||||||
|
|
||||||
info->flags |= ASYNC_INITIALIZED;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -925,6 +925,7 @@ static void mxser_shutdown(struct mxser_port *info)
|
||||||
static int mxser_open(struct tty_struct *tty, struct file *filp)
|
static int mxser_open(struct tty_struct *tty, struct file *filp)
|
||||||
{
|
{
|
||||||
struct mxser_port *info;
|
struct mxser_port *info;
|
||||||
|
unsigned long flags;
|
||||||
int retval, line;
|
int retval, line;
|
||||||
|
|
||||||
line = tty->index;
|
line = tty->index;
|
||||||
|
@ -941,7 +942,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);
|
||||||
info->count++;
|
info->count++;
|
||||||
|
spin_unlock_irqrestore(&info->slock, flags);
|
||||||
retval = mxser_startup(info);
|
retval = mxser_startup(info);
|
||||||
if (retval)
|
if (retval)
|
||||||
return retval;
|
return retval;
|
||||||
|
|
Loading…
Add table
Reference in a new issue