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 <[email protected]>
Signed-off-by: Tobias Klauser <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c
index 721216292a5049882847e9712735b0ca82950b1e..dee7a0eb6ea1a70431c36b5ca61977a0e7487591 100644 (file)
--- 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;
 }