From da5dd189af90a6fd8f96aba7b247eb7c7958aca7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 20 Apr 2012 16:53:58 -0700 Subject: [PATCH] --- yaml --- r: 303583 b: refs/heads/master c: 085fb962623b7278fd2f33a8604c37dd22d06b70 h: refs/heads/master i: 303581: e6b4954f1da58230c618df9db3296b70031e9b1b 303579: 206c54dcc16fcb3a681609fdf1f9f6f5e0fd400d 303575: 4c52df2ca38a8352c5f3ec3a9845baddca4afeb2 303567: 3b16208bd1fd1085e31ad71f7bce0b154139abc1 303551: 246d115c6b7059f7abeaabcfac649fd6fb7fe52c v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/console.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a9fbb849f36..827f90813e6c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45714104b9e85ffa199c5622e227657e99d92fb5 +refs/heads/master: 085fb962623b7278fd2f33a8604c37dd22d06b70 diff --git a/trunk/drivers/usb/serial/console.c b/trunk/drivers/usb/serial/console.c index 1ee6b2ab0f89..b9cca6dcde07 100644 --- a/trunk/drivers/usb/serial/console.c +++ b/trunk/drivers/usb/serial/console.c @@ -113,7 +113,8 @@ static int usb_console_setup(struct console *co, char *options) serial = usb_serial_get_by_index(co->index); if (serial == NULL) { /* no device is connected yet, sorry :( */ - err("No USB device connected to ttyUSB%i", co->index); + printk(KERN_ERR "No USB device connected to ttyUSB%i\n", + co->index); return -ENODEV; } @@ -137,7 +138,7 @@ static int usb_console_setup(struct console *co, char *options) tty = kzalloc(sizeof(*tty), GFP_KERNEL); if (!tty) { retval = -ENOMEM; - err("no more memory"); + dev_err(&port->dev, "no more memory\n"); goto reset_open_count; } kref_init(&tty->kref); @@ -146,7 +147,7 @@ static int usb_console_setup(struct console *co, char *options) tty->index = co->index; if (tty_init_termios(tty)) { retval = -ENOMEM; - err("no more memory"); + dev_err(&port->dev, "no more memory\n"); goto free_tty; } } @@ -159,7 +160,7 @@ static int usb_console_setup(struct console *co, char *options) retval = usb_serial_generic_open(NULL, port); if (retval) { - err("could not open USB console port"); + dev_err(&port->dev, "could not open USB console port\n"); goto fail; }