Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303740
b: refs/heads/master
c: 5542cf7
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 3, 2012
1 parent d1df578 commit 94eb65d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 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: 41ea84d80c6045e35bcaaff88473ed772f3489df
refs/heads/master: 5542cf791c3f1c0e307d3ee330c72f1ca49ef4f5
8 changes: 2 additions & 6 deletions trunk/drivers/usb/serial/keyspan_pda.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ static void keyspan_pda_request_unthrottle(struct work_struct *work)
struct usb_serial *serial = priv->serial;
int result;

dbg(" request_unthrottle");
/* ask the device to tell us when the tx buffer becomes
sufficiently empty */
result = usb_control_msg(serial->dev,
Expand Down Expand Up @@ -226,7 +225,7 @@ static void keyspan_pda_rx_throttle(struct tty_struct *tty)
send an XOFF, although it might make sense to foist that off
upon the device too. */
struct usb_serial_port *port = tty->driver_data;
dbg("keyspan_pda_rx_throttle port %d", port->number);

usb_kill_urb(port->interrupt_in_urb);
}

Expand All @@ -235,7 +234,7 @@ static void keyspan_pda_rx_unthrottle(struct tty_struct *tty)
{
struct usb_serial_port *port = tty->driver_data;
/* just restart the receive interrupt URB */
dbg("keyspan_pda_rx_unthrottle port %d", port->number);

if (usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL))
dbg(" usb_submit_urb(read urb) failed");
}
Expand Down Expand Up @@ -466,7 +465,6 @@ static int keyspan_pda_write(struct tty_struct *tty,
select() or poll() too) until we receive that unthrottle interrupt.
Block if we can't write anything at all, otherwise write as much as
we can. */
dbg("keyspan_pda_write(%d)", count);
if (count == 0) {
dbg(" write request of 0 bytes");
return 0;
Expand Down Expand Up @@ -766,8 +764,6 @@ static int keyspan_pda_startup(struct usb_serial *serial)

static void keyspan_pda_release(struct usb_serial *serial)
{
dbg("%s", __func__);

kfree(usb_get_serial_port_data(serial->port[0]));
}

Expand Down

0 comments on commit 94eb65d

Please sign in to comment.