lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: cyberjack: clean up write-urb busy handling

Browse Source 
Use port write_urbs_free mask rather than write_urb_busy field in struct
serial_port.

Compile-only tested.

Cc: Matthias Bruestle and Harald Welte <support@reiner-sct.com>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Johan Hovold
2011-11-06 19:06:23 +01:00
committed by Greg Kroah-Hartman
parent 120f9dbc96
commit c1cac10c17
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/serial/cyberjack.c
View File

@@ -221,22 +221,18 @@ static int cyberjack_write(struct tty_struct *tty,
return 0; return 0;
} }
spin_lock_bh(&port->lock); if (!test_and_clear_bit(0, &port->write_urbs_free)) {
if (port->write_urb_busy) {
spin_unlock_bh(&port->lock);
dbg("%s - already writing", __func__); dbg("%s - already writing", __func__);
return 0; return 0;
} }
port->write_urb_busy = 1;
spin_unlock_bh(&port->lock);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
if (count+priv->wrfilled > sizeof(priv->wrbuf)) { if (count+priv->wrfilled > sizeof(priv->wrbuf)) {
/* To much data for buffer. Reset buffer. */ /* To much data for buffer. Reset buffer. */
priv->wrfilled = 0; priv->wrfilled = 0;
port->write_urb_busy = 0;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
set_bit(0, &port->write_urbs_free);
return 0; return 0;
} }
@@ -283,7 +279,7 @@ static int cyberjack_write(struct tty_struct *tty,
priv->wrfilled = 0; priv->wrfilled = 0;
priv->wrsent = 0; priv->wrsent = 0;
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
port->write_urb_busy = 0; set_bit(0, &port->write_urbs_free);
return 0; return 0;
} }
@@ -432,7 +428,7 @@ static void cyberjack_write_bulk_callback(struct urb *urb)
dbg("%s - port %d", __func__, port->number); dbg("%s - port %d", __func__, port->number);
port->write_urb_busy = 0; set_bit(0, &port->write_urbs_free);
if (status) { if (status) {
dbg("%s - nonzero write bulk status received: %d", dbg("%s - nonzero write bulk status received: %d",
__func__, status); __func__, status);