aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/atmel_serial.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index 8cea6068f03e..fad245b064d6 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -793,6 +793,7 @@ static void atmel_tasklet_func(unsigned long data)
793static int atmel_startup(struct uart_port *port) 793static int atmel_startup(struct uart_port *port)
794{ 794{
795 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); 795 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
796 struct tty_struct *tty = port->info->tty;
796 int retval; 797 int retval;
797 798
798 /* 799 /*
@@ -806,7 +807,7 @@ static int atmel_startup(struct uart_port *port)
806 * Allocate the IRQ 807 * Allocate the IRQ
807 */ 808 */
808 retval = request_irq(port->irq, atmel_interrupt, IRQF_SHARED, 809 retval = request_irq(port->irq, atmel_interrupt, IRQF_SHARED,
809 "atmel_serial", port); 810 tty ? tty->name : "atmel_serial", port);
810 if (retval) { 811 if (retval) {
811 printk("atmel_serial: atmel_startup - Can't get irq\n"); 812 printk("atmel_serial: atmel_startup - Can't get irq\n");
812 return retval; 813 return retval;