diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-14 15:39:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-14 15:39:23 -0800 |
| commit | 919ba4ee1badf6247f8064bdec2c80e389b57c40 (patch) | |
| tree | e18a358f60e67901093f91a300bbf7b7a6e4d543 /drivers/usb/serial/generic.c | |
| parent | 06087cb42dc1da096c37f51ea12ad676f00569a9 (diff) | |
| parent | 04f9c6e6d17584340fb6c8a9469a0e6df28876d2 (diff) | |
| download | linux-919ba4ee1badf6247f8064bdec2c80e389b57c40.tar.gz linux-919ba4ee1badf6247f8064bdec2c80e389b57c40.tar.xz | |
Merge tag 'usb-serial-3.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v3.18-rc5
Here are a few fixes for reported problems including a possible
null-deref on probe with keyspan, a misbehaving modem, and a couple of
issues with the USB console.
Some new device IDs are also added.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 1bd192290b08..ccf1df7c4b80 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -286,7 +286,7 @@ static int usb_serial_generic_submit_read_urb(struct usb_serial_port *port, res = usb_submit_urb(port->read_urbs[index], mem_flags); if (res) { - if (res != -EPERM) { + if (res != -EPERM && res != -ENODEV) { dev_err(&port->dev, "%s - usb_submit_urb failed: %d\n", __func__, res); @@ -373,7 +373,7 @@ void usb_serial_generic_read_bulk_callback(struct urb *urb) __func__, urb->status); return; default: - dev_err(&port->dev, "%s - nonzero urb status: %d\n", + dev_dbg(&port->dev, "%s - nonzero urb status: %d\n", __func__, urb->status); goto resubmit; } |