aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAristeu Rozanski <aris@ruivo.org>2007-11-12 15:14:49 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 14:34:50 -0800
commit27680d232b04d434d8d49a8417429b9512ffb7c6 (patch)
tree083cf04c12463faf11ce72df2c9a2c57daa3620b
parentd09d6a351498fcd6195f05c3964320ae6fbeadb1 (diff)
USB: usb_serial_console: fix command line parsing
Currently usb serial console support ignores the device and always use ttyUSB0. Signed-off-by: Aristeu Rozanski <arozansk@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/console.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 0362654d3b5..72ab3bbf0f2 100644
--- a/drivers/usb/serial/console.c
+++ b/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;
}