Skip to contentSkip to conversation

pinctrl: intel: unlock on error in intel_config_set_pull()

PATCH In review Dan Carpenter 2 participants 2 messages Feb 7, 2017 – Feb 13, 2017

Subsystems (4)
Kernel janitors GPIO Pin control Pin controller - Intel
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 pinctrl: intel: unlock on error in intel_config_set_pull()

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 <[email protected]>
drivers/pinctrl/intel/pinctrl-intel.c +4 -2
index 523264463d35..592b465e981e 100644
@@ -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:
#1 lore raw
Quoted 4 lines · Dan Carpenter

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 <[email protected]>

Patch applied as obviously correct.

Yours,
Linus Walleij