pinctrl/abx500: destroy mutex if returning early due to error
authorLee Jones <lee.jones@linaro.org>
Wed, 16 Jan 2013 09:17:13 +0000 (09:17 +0000)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 5 Feb 2013 12:54:24 +0000 (13:54 +0100)
Current failure path neglects to mutex_destroy() before returning
an error due to an invalid parameter or an error received from
gpiochip_add(). This patch aims to remedy that behaviour.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-abx500.c

index 426b47c..81ef515 100644 (file)
@@ -1155,11 +1155,13 @@ static int abx500_gpio_probe(struct platform_device *pdev)
        default:
                dev_err(&pdev->dev, "Unsupported pinctrl sub driver (%d)\n",
                                (int) platid->driver_data);
+               mutex_destroy(&pct->lock);
                return -EINVAL;
        }
 
        if (!pct->soc) {
                dev_err(&pdev->dev, "Invalid SOC data\n");
+               mutex_destroy(&pct->lock);
                return -EINVAL;
        }
 
@@ -1176,6 +1178,7 @@ static int abx500_gpio_probe(struct platform_device *pdev)
        ret = gpiochip_add(&pct->chip);
        if (ret) {
                dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
+               mutex_destroy(&pct->lock);
                goto out_rem_irq;
        }
        dev_info(&pdev->dev, "added gpiochip\n");