---

yaml --- r: 289431 b: refs/heads/master c: f1475a0 h: refs/heads/master i: 289429: 1a43f43 289427: fedd7ed 289423: 34bd644 v: v3
git-mirror · Feb 10, 2012 · 24a6d20 · 24a6d20
1 parent 353ca41
commit 24a6d20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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;