From 3d5d6492c3d480754cd6a2869712cf80ecbd9bfb Mon Sep 17 00:00:00 2001 From: Elina Pasheva Date: Tue, 12 May 2009 13:12:37 -0700 Subject: [PATCH] --- yaml --- r: 151369 b: refs/heads/master c: c76a23da8e9a39222c4a7c29b0c5348cd8902a2b h: refs/heads/master i: 151367: 0fbd93a6b7b38b29e3ad2d1caaa65c9bd4a9cd62 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/sierra.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3069bfaf392c..d299d3f9aba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 238ebd138c9704e1162030c1e600bc06142cb2c8 +refs/heads/master: c76a23da8e9a39222c4a7c29b0c5348cd8902a2b diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c index 9d11fe47633b..bcfe0ac1e221 100644 --- a/trunk/drivers/usb/serial/sierra.c +++ b/trunk/drivers/usb/serial/sierra.c @@ -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); @@ -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); } }