[PATCH] mpc52xx/serial: fix error paths in probe function

[Wolfram Sang]

- error cases for mapbase and irq were unbundled
- mapped irq now gets disposed on error
- errors return ENODEV instead of EINVAL as they are not dependant on
  arguments

Signed-off-by: Wolfram Sang <[EMAIL PROTECTED]>
---
 drivers/serial/mpc52xx_uart.c |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 3234100..93e8893 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1113,14 +1113,14 @@ mpc52xx_uart_of_probe(struct of_device *op, const 
struct of_device_id *match)
                if (mpc52xx_uart_nodes[idx] == op->node)
                        break;
        if (idx >= MPC52xx_PSC_MAXNUM)
-               return -EINVAL;
+               return -ENODEV;
        pr_debug("Found %s assigned to ttyPSC%x\n",
                 mpc52xx_uart_nodes[idx]->full_name, idx);
 
        uartclk = psc_ops->getuartclk(op->node);
        if (uartclk == 0) {
                dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
-               return -EINVAL;
+               return -ENODEV;
        }
 
        /* Init the port structure */
@@ -1142,22 +1142,29 @@ mpc52xx_uart_of_probe(struct of_device *op, const 
struct of_device_id *match)
                return ret;
 
        port->mapbase = res.start;
+       if (!port->mapbase) {
+               dev_err(&op->dev, "Could not allocate resources for PSC\n");
+               return -ENODEV;
+       }
+
        port->irq = irq_of_parse_and_map(op->node, 0);
+       if (port->irq == NO_IRQ) {
+               dev_err(&op->dev, "Could not get irq\n");
+               return -ENODEV;
+       }
 
        dev_dbg(&op->dev, "mpc52xx-psc uart at %p, irq=%x, freq=%i\n",
                (void *)port->mapbase, port->irq, port->uartclk);
 
-       if ((port->irq == NO_IRQ) || !port->mapbase) {
-               printk(KERN_ERR "Could not allocate resources for PSC\n");
-               return -EINVAL;
-       }
-
        /* Add the port to the uart sub-system */
        ret = uart_add_one_port(&mpc52xx_uart_driver, port);
-       if (!ret)
-               dev_set_drvdata(&op->dev, (void *)port);
+       if (ret) {
+               irq_dispose_mapping(port->irq);
+               return -ENODEV;
+       }
 
-       return ret;
+       dev_set_drvdata(&op->dev, (void *)port);
+       return 0;
 }
 
 static int
-- 
1.5.6.5

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev