From 45070d12a4313161616254160f19ce233f496795 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Fri, 8 Feb 2008 04:21:08 -0800 Subject: [PATCH] --- yaml --- r: 84769 b: refs/heads/master c: ae161068756c203ccbeeb9178f4d4f6665d294cf h: refs/heads/master i: 84767: 7c37f7515cfd111e433cbd6923fba3e09cbb6a85 v: v3 --- [refs] | 2 +- trunk/drivers/serial/atmel_serial.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 71e34226f1f8..ca1685ac64eb 100644 --- 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 index 8cea6068f03e..fad245b064d6 100644 --- 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;