Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325603
b: refs/heads/master
c: 000c74d
h: refs/heads/master
i:
  325601: 51abe07
  325599: ed92331
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 12, 2012
1 parent 63b2ffb commit 5f7c0a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 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: 79d753209245de3d6f02480535a8f5cf21ad02f7
refs/heads/master: 000c74d9fa14ec61411310187cfa9e43581593b5
8 changes: 1 addition & 7 deletions trunk/drivers/usb/serial/metro-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,14 @@ static void metrousb_read_int_callback(struct urb *urb)

/* Set the data read from the usb port into the serial port buffer. */
tty = tty_port_tty_get(&port->port);
if (!tty) {
dev_err(&port->dev, "%s - bad tty pointer - exiting\n",
__func__);
return;
}

if (tty && urb->actual_length) {
/* Loop through the data copying each byte to the tty layer. */
tty_insert_flip_string(tty, data, urb->actual_length);

/* Force the data to the tty layer. */
tty_flip_buffer_push(tty);
tty_kref_put(tty);
}
tty_kref_put(tty);

/* Set any port variables. */
spin_lock_irqsave(&metro_priv->lock, flags);
Expand Down

0 comments on commit 5f7c0a6

Please sign in to comment.