---

yaml --- r: 84769 b: refs/heads/master c: ae16106 h: refs/heads/master i: 84767: 7c37f75 v: v3
git-mirror · Feb 8, 2008 · 45070d1 · 45070d1
1 parent 9e9b525
commit 45070d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c811ab8c2daf6bc2b5761937929a62fa84b18b32
+refs/heads/master: ae161068756c203ccbeeb9178f4d4f6665d294cf
diff --git a/trunk/drivers/serial/atmel_serial.c b/trunk/drivers/serial/atmel_serial.c
@@ -793,6 +793,7 @@ static void atmel_tasklet_func(unsigned long data)
 static int atmel_startup(struct uart_port *port)
 {
 	struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
+	struct tty_struct *tty = port->info->tty;
 	int retval;
 
 	/*
@@ -806,7 +807,7 @@ static int atmel_startup(struct uart_port *port)
 	 * Allocate the IRQ
 	 */
 	retval = request_irq(port->irq, atmel_interrupt, IRQF_SHARED,
-			"atmel_serial", port);
+			tty ? tty->name : "atmel_serial", port);
 	if (retval) {
 		printk("atmel_serial: atmel_startup - Can't get irq\n");
 		return retval;