[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <9212990ebdb34f2b80d6858a9ba2a88b4d53a207.1297244810.git.tklauser@distanz.ch>
Date: Wed, 9 Feb 2011 10:51:34 +0100
From: Tobias Klauser <tklauser@...tanz.ch>
To: Greg Kroah-Hartman <gregkh@...e.de>, linux-serial@...r.kernel.org
Cc: nios2-dev@...c.et.ntust.edu.tw, linux-kernel@...r.kernel.org,
Anton Vorontsov <cbouatmailru@...il.com>
Subject: [PATCH 1/4] tty: serial: altera_uart: Handle pdev->id == -1 in altera_uart_remove
Commit 6b5756f176568a710d008d3b478128fafb6707f0 introduced the
possibility for pdev->id being -1 but the change was not done equally in
altera_uart_remove. This patch fixes this.
Cc: Anton Vorontsov <cbouatmailru@...il.com>
Signed-off-by: Tobias Klauser <tklauser@...tanz.ch>
---
drivers/tty/serial/altera_uart.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 7212162..dee7a0e 100644
--- a/drivers/tty/serial/altera_uart.c
+++ b/drivers/tty/serial/altera_uart.c
@@ -561,9 +561,15 @@ static int __devinit altera_uart_probe(struct platform_device *pdev)
static int __devexit altera_uart_remove(struct platform_device *pdev)
{
- struct uart_port *port = &altera_uart_ports[pdev->id].port;
+ struct uart_port *port;
+ int i = pdev->id;
+ if (i == -1)
+ i = 0;
+
+ port = &altera_uart_ports[i].port;
uart_remove_one_port(&altera_uart_driver, port);
+
return 0;
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists