| From 548dd4b6da8a8e428453d55f7fa7b8a46498d147 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Fri, 10 Feb 2012 13:20:49 +0100 |
| Subject: USB: serial: fix console error reporting |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| commit 548dd4b6da8a8e428453d55f7fa7b8a46498d147 upstream. |
| |
| Do not report errors in write path if port is used as a console as this |
| may trigger the same error (and error report) resulting in a loop. |
| |
| Reported-by: Stephen Hemminger <shemminger@vyatta.com> |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/generic.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/usb/serial/generic.c |
| +++ b/drivers/usb/serial/generic.c |
| @@ -215,8 +215,10 @@ retry: |
| clear_bit(i, &port->write_urbs_free); |
| result = usb_submit_urb(urb, GFP_ATOMIC); |
| if (result) { |
| - dev_err(&port->dev, "%s - error submitting urb: %d\n", |
| + if (!port->port.console) { |
| + dev_err(&port->dev, "%s - error submitting urb: %d\n", |
| __func__, result); |
| + } |
| set_bit(i, &port->write_urbs_free); |
| spin_lock_irqsave(&port->lock, flags); |
| port->tx_bytes -= count; |
