From e2254378a56149c04a1e973e5a7effea199c98f3 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 9 Feb 2011 10:56:52 +0100 Subject: [PATCH] --- yaml --- r: 235534 b: refs/heads/master c: e96fabd8791aad30a3c8a03919893ae3e2e3df25 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/altera_uart.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6e0bfeb226cb..dc36a8246a54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d637837583163a1a70331ce48097f697cac85e32 +refs/heads/master: e96fabd8791aad30a3c8a03919893ae3e2e3df25 diff --git a/trunk/drivers/tty/serial/altera_uart.c b/trunk/drivers/tty/serial/altera_uart.c index 721216292a50..dee7a0eb6ea1 100644 --- a/trunk/drivers/tty/serial/altera_uart.c +++ b/trunk/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; }