Merge branch 'usb-3.3-rc4' into usb-next

This is to pull in the xhci changes and the other fixes and device id
updates that were done in Linus's tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index f7403576f99f..2a2fa2d0489d 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -217,7 +217,7 @@ 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",
+                dev_err_console(port, "%s - error submitting urb: %d\n",
                                                 __func__, result);
                 set_bit(i, &port->write_urbs_free);
                 spin_lock_irqsave(&port->lock, flags);