diff options
author | Elina Pasheva <epasheva@sierrawireless.com> | 2009-05-12 16:12:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:45 -0400 |
commit | c76a23da8e9a39222c4a7c29b0c5348cd8902a2b (patch) | |
tree | 98d28e754a248a30a2a5186f91d13dc742f83c8a | |
parent | 238ebd138c9704e1162030c1e600bc06142cb2c8 (diff) |
USB: serial: sierra driver interrupt urb resubmit fix
- Fixed a problem when re-submitting urb from interrupt callback in
function sierra_instat_callback(). This suppresses also issuing of
error messages in /var/log/kern.log
- Removed redundant debug message at the beginning of
sierra_instat_callback() function
- Changed a debug message to be an error message
Signed-off-by: Elina Pasheva <epasheva@sierrawireless.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/serial/sierra.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 9d11fe47633b..bcfe0ac1e221 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
@@ -556,7 +556,6 @@ static void sierra_instat_callback(struct urb *urb) | |||
556 | struct sierra_port_private *portdata = usb_get_serial_port_data(port); | 556 | struct sierra_port_private *portdata = usb_get_serial_port_data(port); |
557 | struct usb_serial *serial = port->serial; | 557 | struct usb_serial *serial = port->serial; |
558 | 558 | ||
559 | dev_dbg(&port->dev, "%s\n", __func__); | ||
560 | dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__, | 559 | dev_dbg(&port->dev, "%s: urb %p port %p has data %p\n", __func__, |
561 | urb, port, portdata); | 560 | urb, port, portdata); |
562 | 561 | ||
@@ -600,12 +599,12 @@ static void sierra_instat_callback(struct urb *urb) | |||
600 | dev_dbg(&port->dev, "%s: error %d\n", __func__, status); | 599 | dev_dbg(&port->dev, "%s: error %d\n", __func__, status); |
601 | 600 | ||
602 | /* Resubmit urb so we continue receiving IRQ data */ | 601 | /* Resubmit urb so we continue receiving IRQ data */ |
603 | if (status != -ESHUTDOWN) { | 602 | if (port->port.count && status != -ESHUTDOWN && status != -ENOENT) { |
604 | urb->dev = serial->dev; | 603 | urb->dev = serial->dev; |
605 | err = usb_submit_urb(urb, GFP_ATOMIC); | 604 | err = usb_submit_urb(urb, GFP_ATOMIC); |
606 | if (err) | 605 | if (err) |
607 | dev_dbg(&port->dev, "%s: resubmit intr urb " | 606 | dev_err(&port->dev, "%s: resubmit intr urb " |
608 | "failed. (%d)\n", __func__, err); | 607 | "failed. (%d)\n", __func__, err); |
609 | } | 608 | } |
610 | } | 609 | } |
611 | 610 | ||