Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 151369
b: refs/heads/master
c: c76a23d
h: refs/heads/master
i:
  151367: 0fbd93a
v: v3
  • Loading branch information
Elina Pasheva authored and Greg Kroah-Hartman committed Jun 16, 2009
1 parent 8a99d8b commit 3d5d649
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 238ebd138c9704e1162030c1e600bc06142cb2c8
refs/heads/master: c76a23da8e9a39222c4a7c29b0c5348cd8902a2b
7 changes: 3 additions & 4 deletions trunk/drivers/usb/serial/sierra.c
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,6 @@ static void sierra_instat_callback(struct urb *urb)
struct sierra_port_private *portdata = usb_get_serial_port_data(port);
struct usb_serial *serial = port->serial;

dev_dbg(&port->dev, "%s\n", __func__);
dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__,
urb, port, portdata);

Expand Down Expand Up @@ -600,12 +599,12 @@ static void sierra_instat_callback(struct urb *urb)
dev_dbg(&port->dev, "%s: error %d\n", __func__, status);

/* Resubmit urb so we continue receiving IRQ data */
if (status != -ESHUTDOWN) {
if (port->port.count && status != -ESHUTDOWN && status != -ENOENT) {
urb->dev = serial->dev;
err = usb_submit_urb(urb, GFP_ATOMIC);
if (err)
dev_dbg(&port->dev, "%s: resubmit intr urb "
"failed. (%d)\n", __func__, err);
dev_err(&port->dev, "%s: resubmit intr urb "
"failed. (%d)\n", __func__, err);
}
}

Expand Down

0 comments on commit 3d5d649

Please sign in to comment.