Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / serial / mpc52xx_uart.c

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 955bbd6..8d24cd5 100644 (file)
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -995,8 +995,10 @@ mpc52xx_uart_of_remove(struct of_device *op)
        struct uart_port *port = dev_get_drvdata(&op->dev);
        dev_set_drvdata(&op->dev, NULL);
 
-       if (port)
+       if (port) {
                uart_remove_one_port(&mpc52xx_uart_driver, port);
+               irq_dispose_mapping(port->irq);
+       }
 
        return 0;
 }