mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
USB: serial: digi_acceleport: add chars_in_buffer locking
Both the dp_write_urb_in_use flag and dp_out_buf_len counter should be accessed while holding the driver port lock. Add the missing locking to chars_in_buffer and clean up the implementation somewhat by using a common exit path. Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
parent
3aed3af202
commit
dcbc0ae4f8
1 changed files with 11 additions and 9 deletions
|
@ -1044,17 +1044,19 @@ static unsigned int digi_chars_in_buffer(struct tty_struct *tty)
|
||||||
{
|
{
|
||||||
struct usb_serial_port *port = tty->driver_data;
|
struct usb_serial_port *port = tty->driver_data;
|
||||||
struct digi_port *priv = usb_get_serial_port_data(port);
|
struct digi_port *priv = usb_get_serial_port_data(port);
|
||||||
|
unsigned long flags;
|
||||||
|
unsigned int chars;
|
||||||
|
|
||||||
if (priv->dp_write_urb_in_use) {
|
spin_lock_irqsave(&priv->dp_port_lock, flags);
|
||||||
dev_dbg(&port->dev, "digi_chars_in_buffer: port=%d, chars=%d\n",
|
if (priv->dp_write_urb_in_use)
|
||||||
priv->dp_port_num, port->bulk_out_size - 2);
|
chars = port->bulk_out_size - 2;
|
||||||
return port->bulk_out_size - 2;
|
else
|
||||||
} else {
|
chars = priv->dp_out_buf_len;
|
||||||
dev_dbg(&port->dev, "digi_chars_in_buffer: port=%d, chars=%d\n",
|
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
|
||||||
priv->dp_port_num, priv->dp_out_buf_len);
|
|
||||||
return priv->dp_out_buf_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
dev_dbg(&port->dev, "%s: port=%d, chars=%d\n", __func__,
|
||||||
|
priv->dp_port_num, chars);
|
||||||
|
return chars;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void digi_dtr_rts(struct usb_serial_port *port, int on)
|
static void digi_dtr_rts(struct usb_serial_port *port, int on)
|
||||||
|
|
Loading…
Reference in a new issue