]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
pinctrl: core: fix missing unlock on error in pinctrl_find_gpio_range_from_pin()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Tue, 18 Jun 2013 04:24:58 +0000 (12:24 +0800)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 18 Jun 2013 07:41:15 +0000 (09:41 +0200)
Add the missing unlock before return from function pinctrl_find_gpio_range_from_pin()
in the error handling case.

Introduced by commit 2ff3477efd7086544b9e298fc63afab0645921b4.
(pinctrl: add pin list based GPIO ranges)

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/core.c

index 32eb7e2a3f340e3c3fb24dd11647039e72c90580..d759889ead9ac36a53e12591441af6b4489733c5 100644 (file)
@@ -465,7 +465,7 @@ struct pinctrl_gpio_range *
 pinctrl_find_gpio_range_from_pin(struct pinctrl_dev *pctldev,
                                 unsigned int pin)
 {
-       struct pinctrl_gpio_range *range = NULL;
+       struct pinctrl_gpio_range *range;
 
        mutex_lock(&pctldev->mutex);
        /* Loop over the ranges */
@@ -475,17 +475,16 @@ pinctrl_find_gpio_range_from_pin(struct pinctrl_dev *pctldev,
                        int a;
                        for (a = 0; a < range->npins; a++) {
                                if (range->pins[a] == pin)
-                                       return range;
+                                       goto out;
                        }
                } else if (pin >= range->pin_base &&
-                          pin < range->pin_base + range->npins) {
-                       mutex_unlock(&pctldev->mutex);
-                       return range;
-               }
+                          pin < range->pin_base + range->npins)
+                       goto out;
        }
+       range = NULL;
+out:
        mutex_unlock(&pctldev->mutex);
-
-       return NULL;
+       return range;
 }
 EXPORT_SYMBOL_GPL(pinctrl_find_gpio_range_from_pin);