Skip to content

Commit

Permalink
USB: serial: ftd_sio usb: move status check
Browse files Browse the repository at this point in the history
Alan Stern commented that the private driver counts must be updated
regard less of the status return on the urb when the write call back
is executed.

This patch alters the behavior to update the private driver counts by
simply moving the status check to after the driver count update.

Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jason Wessel authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent 715b1dc commit 87c1edd
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/usb/serial/ftdi_sio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1884,11 +1884,6 @@ static void ftdi_write_bulk_callback(struct urb *urb)

dbg("%s - port %d", __func__, port->number);

if (status) {
dbg("nonzero write bulk status received: %d", status);
return;
}

priv = usb_get_serial_port_data(port);
if (!priv) {
dbg("%s - bad port private data pointer - exiting", __func__);
Expand All @@ -1906,6 +1901,11 @@ static void ftdi_write_bulk_callback(struct urb *urb)
priv->tx_outstanding_bytes -= countback;
spin_unlock_irqrestore(&priv->tx_lock, flags);

if (status) {
dbg("nonzero write bulk status received: %d", status);
return;
}

usb_serial_port_softint(port);
} /* ftdi_write_bulk_callback */

Expand Down

0 comments on commit 87c1edd

Please sign in to comment.