OSDN Git Service

pinctrl: intel: unlock on error in intel_config_set_pull()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 7 Feb 2017 13:20:08 +0000 (16:20 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 13 Feb 2017 14:42:26 +0000 (15:42 +0100)
We need to unlock before returning -EINVAL on this error path.

Fixes: 04cc058f0c52 ("pinctrl: intel: Add support for 1k additional pull-down")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/intel/pinctrl-intel.c

index 5232644..592b465 100644 (file)
@@ -599,8 +599,10 @@ static int intel_config_set_pull(struct intel_pinctrl *pctrl, unsigned pin,
                        value |= PADCFG1_TERM_5K << PADCFG1_TERM_SHIFT;
                        break;
                case 1000:
-                       if (!(community->features & PINCTRL_FEATURE_1K_PD))
-                               return -EINVAL;
+                       if (!(community->features & PINCTRL_FEATURE_1K_PD)) {
+                               ret = -EINVAL;
+                               break;
+                       }
                        value |= PADCFG1_TERM_1K << PADCFG1_TERM_SHIFT;
                        break;
                default: