[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1268053803-7666-1-git-send-email-abogani@texware.it>
Date: Mon, 8 Mar 2010 14:10:03 +0100
From: Alessio Igor Bogani <abogani@...ware.it>
To: Greg Kroah-Hartman <gregkh@...e.de>
Cc: Johan Hovold <jhovold@...il.com>, Alan Cox <alan@...ux.intel.com>,
Daniel Mack <daniel@...aq.de>,
"Mark J. Adamson" <mark.adamson@...ichip.com>,
linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
Alessio Igor Bogani <abogani@...ware.it>
Subject: [PATCH] USB: ftdi_sio: Fix locking for change_speed() function
The change_speed() function set the baudrate of the device: so this function
should be serialized against multiple calls. Use the cfg_lock mutex to do this.
Signed-off-by: Alessio Igor Bogani <abogani@...ware.it>
---
drivers/usb/serial/ftdi_sio.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 6af0dfa..963a70f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1272,8 +1272,8 @@ check_and_exit:
(priv->flags & ASYNC_SPD_MASK)) ||
(((priv->flags & ASYNC_SPD_MASK) == ASYNC_SPD_CUST) &&
(old_priv.custom_divisor != priv->custom_divisor))) {
- mutex_unlock(&priv->cfg_lock);
change_speed(tty, port);
+ mutex_unlock(&priv->cfg_lock);
}
else
mutex_unlock(&priv->cfg_lock);
@@ -2264,9 +2264,11 @@ static void ftdi_set_termios(struct tty_struct *tty,
clear_mctrl(port, TIOCM_DTR | TIOCM_RTS);
} else {
/* set the baudrate determined before */
+ mutex_lock(&priv->cfg_lock);
if (change_speed(tty, port))
dev_err(&port->dev, "%s urb failed to set baudrate\n",
__func__);
+ mutex_unlock(&priv->cfg_lock);
/* Ensure RTS and DTR are raised when baudrate changed from 0 */
if (!old_termios || (old_termios->c_cflag & CBAUD) == B0)
set_mctrl(port, TIOCM_DTR | TIOCM_RTS);
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists