diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 08:59:00 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 08:59:00 -0600 |
| commit | 6624b35d6250632497c5943faa2ee2a91344d91c (patch) | |
| tree | f58947a6fd0698ce4626be2a4125e149ea6370ef /drivers | |
| parent | d71a1dc62b0380ab9c4022dcba02775a791c3d7e (diff) | |
| parent | fc7900bb04c4290f3a8e43abf231aee566feff6d (diff) | |
Merge branch 'master' into 83xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/mpc52xx_uart.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c index 955bbd653e2..8d24cd52105 100644 --- 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; } |