From: Tobias Klauser <tklauser@distanz.ch>
Date: Wed, 9 Feb 2011 09:56:52 +0000 (+0100)
Subject: tty: serial: altera_uart: Handle pdev->id == -1 in altera_uart_remove
X-Git-Tag: MMI-PSA29.97-13-9~20522^2~46
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e96fabd8791aad30a3c8a03919893ae3e2e3df25;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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.

Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 721216292a50..dee7a0eb6ea1 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;
 }