From 742794e7d03fac715b6dd8558bc9c6623c948e82 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Mon, 11 May 2009 15:24:08 -0500 Subject: [PATCH] --- yaml --- r: 151365 b: refs/heads/master c: 87c1edd217a6742e48028db6664d7763de0449f6 h: refs/heads/master i: 151363: e6fa983600820b7159a1c3d480416f2813b2a7f0 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7457b2a65068..8987b1313c35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 715b1dc01fe44537e8fce9566e4bb48d6821d84b +refs/heads/master: 87c1edd217a6742e48028db6664d7763de0449f6 diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index 74cc3c831604..fc527de73465 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -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__); @@ -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 */