Skip to content

Commit

Permalink
USB: iuu_phoenix: lock priv->tiostatus properly
Browse files Browse the repository at this point in the history
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Apr 25, 2008
1 parent e298449 commit 7b1fc8b
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions drivers/usb/serial/iuu_phoenix.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,21 @@ static int iuu_tiocmset(struct usb_serial_port *port, struct file *file,
unsigned int set, unsigned int clear)
{
struct iuu_private *priv = usb_get_serial_port_data(port);
struct tty_struct *tty;
tty = port->tty;
unsigned long flags;

/* FIXME: locking on tiomstatus */
dbg("%s (%d) msg : SET = 0x%04x, CLEAR = 0x%04x ", __FUNCTION__,
port->number, set, clear);

spin_lock_irqsave(&priv->lock, flags);
if (set & TIOCM_RTS)
priv->tiostatus = TIOCM_RTS;

if (!(set & TIOCM_RTS) && priv->tiostatus == TIOCM_RTS) {
dbg("%s TIOCMSET RESET called !!!", __FUNCTION__);
priv->reset = 1;
return 0;
}

spin_unlock_irqrestore(&priv->lock, flags);
return 0;
}

Expand All @@ -173,7 +174,14 @@ static int iuu_tiocmset(struct usb_serial_port *port, struct file *file,
static int iuu_tiocmget(struct usb_serial_port *port, struct file *file)
{
struct iuu_private *priv = usb_get_serial_port_data(port);
return priv->tiostatus;
unsigned long flags;
int rc;

spin_lock_irqsave(&priv->lock, flags);
rc = priv->tiostatus;
spin_unlock_irqrestore(&priv->lock, flags);

return rc;
}

static void iuu_rxcmd(struct urb *urb)
Expand Down

0 comments on commit 7b1fc8b

Please sign in to comment.