Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151365
b: refs/heads/master
c: 87c1edd
h: refs/heads/master
i:
  151363: e6fa983
v: v3
  • Loading branch information
Jason Wessel authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent cc39bcd commit 742794e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 715b1dc01fe44537e8fce9566e4bb48d6821d84b
refs/heads/master: 87c1edd217a6742e48028db6664d7763de0449f6
10 changes: 5 additions & 5 deletions trunk/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 742794e

Please sign in to comment.