Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 143256
b: refs/heads/master
c: cf54509
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Apr 14, 2009
1 parent fbd0df8 commit cf55697
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 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: 7a9a65ced11ece416b730d6f21040a18e62d78a8
refs/heads/master: cf5450930db0ae308584e5361f3345e0ff73e643
26 changes: 14 additions & 12 deletions trunk/drivers/usb/serial/ti_usb_3410_5052.c
Original file line number Diff line number Diff line change
Expand Up @@ -1215,20 +1215,22 @@ static void ti_bulk_in_callback(struct urb *urb)
}

tty = tty_port_tty_get(&port->port);
if (tty && urb->actual_length) {
usb_serial_debug_data(debug, dev, __func__,
urb->actual_length, urb->transfer_buffer);

if (!tport->tp_is_open)
dbg("%s - port closed, dropping data", __func__);
else
ti_recv(&urb->dev->dev, tty,
if (tty) {
if (urb->actual_length) {
usb_serial_debug_data(debug, dev, __func__,
urb->actual_length, urb->transfer_buffer);

if (!tport->tp_is_open)
dbg("%s - port closed, dropping data",
__func__);
else
ti_recv(&urb->dev->dev, tty,
urb->transfer_buffer,
urb->actual_length);

spin_lock(&tport->tp_lock);
tport->tp_icount.rx += urb->actual_length;
spin_unlock(&tport->tp_lock);
spin_lock(&tport->tp_lock);
tport->tp_icount.rx += urb->actual_length;
spin_unlock(&tport->tp_lock);
}
tty_kref_put(tty);
}

Expand Down

0 comments on commit cf55697

Please sign in to comment.