From 24a6d20f4f67bb809a801d320d907a2e2d4e8727 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 10 Feb 2012 13:20:50 +0100 Subject: [PATCH] --- yaml --- r: 289431 b: refs/heads/master c: f1475a00a11b07e6ac7f97971466c1bfbf491957 h: refs/heads/master i: 289429: 1a43f43bea7d3bfab230d5445291a8d5f91172ca 289427: fedd7edd3f61e41e4f238f6c67142d3c125b925f 289423: 34bd644139b2cdc614413230641824f2ebd8960e v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/generic.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ea57882356e0..daefc504a2f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 548dd4b6da8a8e428453d55f7fa7b8a46498d147 +refs/heads/master: f1475a00a11b07e6ac7f97971466c1bfbf491957 diff --git a/trunk/drivers/usb/serial/generic.c b/trunk/drivers/usb/serial/generic.c index e129fcd69fd9..2a2fa2d0489d 100644 --- a/trunk/drivers/usb/serial/generic.c +++ b/trunk/drivers/usb/serial/generic.c @@ -217,10 +217,8 @@ static int usb_serial_generic_write_start(struct usb_serial_port *port) clear_bit(i, &port->write_urbs_free); result = usb_submit_urb(urb, GFP_ATOMIC); if (result) { - if (!port->port.console) { - 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); port->tx_bytes -= count;