aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/atmel_serial.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
-rw-r--r--drivers/tty/serial/atmel_serial.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index e287fe8f10fc..55b3eff148b1 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1757,7 +1757,6 @@ static int atmel_startup(struct uart_port *port)
1757{ 1757{
1758 struct platform_device *pdev = to_platform_device(port->dev); 1758 struct platform_device *pdev = to_platform_device(port->dev);
1759 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); 1759 struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
1760 struct tty_struct *tty = port->state->port.tty;
1761 int retval; 1760 int retval;
1762 1761
1763 /* 1762 /*
@@ -1772,8 +1771,8 @@ static int atmel_startup(struct uart_port *port)
1772 * Allocate the IRQ 1771 * Allocate the IRQ
1773 */ 1772 */
1774 retval = request_irq(port->irq, atmel_interrupt, 1773 retval = request_irq(port->irq, atmel_interrupt,
1775 IRQF_SHARED | IRQF_COND_SUSPEND, 1774 IRQF_SHARED | IRQF_COND_SUSPEND,
1776 tty ? tty->name : "atmel_serial", port); 1775 dev_name(&pdev->dev), port);
1777 if (retval) { 1776 if (retval) {
1778 dev_err(port->dev, "atmel_startup - Can't get irq\n"); 1777 dev_err(port->dev, "atmel_startup - Can't get irq\n");
1779 return retval; 1778 return retval;