---
 drivers/usb/serial/console.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

--- upstream.orig/drivers/usb/serial/console.c	2007-11-12 11:56:02.000000000 -0500
+++ upstream/drivers/usb/serial/console.c	2007-11-12 14:38:12.000000000 -0500
@@ -133,11 +133,14 @@ static int usb_console_setup(struct cons
 	}
 	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;
 	}