From 1ac007aad7dba3057a6a702865afb35c42192b5d Mon Sep 17 00:00:00 2001 From: Aristeu Rozanski Date: Mon, 12 Nov 2007 15:14:49 -0500 Subject: [PATCH] --- yaml --- r: 82204 b: refs/heads/master c: 27680d232b04d434d8d49a8417429b9512ffb7c6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/console.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9bd860c11273..d024e68b2152 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d09d6a351498fcd6195f05c3964320ae6fbeadb1 +refs/heads/master: 27680d232b04d434d8d49a8417429b9512ffb7c6 diff --git a/trunk/drivers/usb/serial/console.c b/trunk/drivers/usb/serial/console.c index 0362654d3b52..72ab3bbf0f2e 100644 --- a/trunk/drivers/usb/serial/console.c +++ b/trunk/drivers/usb/serial/console.c @@ -133,11 +133,14 @@ static int usb_console_setup(struct console *co, char *options) } co->cflag = cflag; - /* grab the first serial port that happens to be connected */ - serial = usb_serial_get_by_index(0); + /* + * no need to check the index here: if the index is wrong, console + * code won't call us + */ + serial = usb_serial_get_by_index(co->index); if (serial == NULL) { /* no device is connected yet, sorry :( */ - err ("No USB device connected to ttyUSB0"); + err ("No USB device connected to ttyUSB%i", co->index); return -ENODEV; }