aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2009-05-11 16:24:08 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-16 00:44:45 -0400
commit87c1edd217a6742e48028db6664d7763de0449f6 (patch)
tree52dd981d6b2af6a10db8ec83b4b78d29a907a2c1
parent715b1dc01fe44537e8fce9566e4bb48d6821d84b (diff)
USB: serial: ftd_sio usb: move status check
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>
-rw-r--r--drivers/usb/serial/ftdi_sio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 74cc3c831604..fc527de73465 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1884,11 +1884,6 @@ static void ftdi_write_bulk_callback(struct urb *urb)
1884 1884
1885 dbg("%s - port %d", __func__, port->number); 1885 dbg("%s - port %d", __func__, port->number);
1886 1886
1887 if (status) {
1888 dbg("nonzero write bulk status received: %d", status);
1889 return;
1890 }
1891
1892 priv = usb_get_serial_port_data(port); 1887 priv = usb_get_serial_port_data(port);
1893 if (!priv) { 1888 if (!priv) {
1894 dbg("%s - bad port private data pointer - exiting", __func__); 1889 dbg("%s - bad port private data pointer - exiting", __func__);
@@ -1906,6 +1901,11 @@ static void ftdi_write_bulk_callback(struct urb *urb)
1906 priv->tx_outstanding_bytes -= countback; 1901 priv->tx_outstanding_bytes -= countback;
1907 spin_unlock_irqrestore(&priv->tx_lock, flags); 1902 spin_unlock_irqrestore(&priv->tx_lock, flags);
1908 1903
1904 if (status) {
1905 dbg("nonzero write bulk status received: %d", status);
1906 return;
1907 }
1908
1909 usb_serial_port_softint(port); 1909 usb_serial_port_softint(port);
1910} /* ftdi_write_bulk_callback */ 1910} /* ftdi_write_bulk_callback */
1911 1911