* [patch] pinctrl: intel: unlock on error in intel_config_set_pull()
@ 2017-02-07 13:20 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-02-07 13:20 UTC (permalink / raw)
To: Mika Westerberg
Cc: Heikki Krogerus, Linus Walleij, linux-gpio, kernel-janitors
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>
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 523264463d35..592b465e981e 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -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:
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch] pinctrl: intel: unlock on error in intel_config_set_pull()
@ 2017-02-07 13:20 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2017-02-07 13:20 UTC (permalink / raw)
To: Mika Westerberg
Cc: Heikki Krogerus, Linus Walleij, linux-gpio, kernel-janitors
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>
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c
index 523264463d35..592b465e981e 100644
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -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:
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch] pinctrl: intel: unlock on error in intel_config_set_pull()
2017-02-07 13:20 ` Dan Carpenter
@ 2017-02-13 14:42 ` Linus Walleij
-1 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2017-02-13 14:42 UTC (permalink / raw)
To: Dan Carpenter
Cc: Mika Westerberg, Heikki Krogerus, linux-gpio, kernel-janitors
On Tue, Feb 7, 2017 at 2:20 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 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>
Patch applied as obviously correct.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch] pinctrl: intel: unlock on error in intel_config_set_pull()
@ 2017-02-13 14:42 ` Linus Walleij
0 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2017-02-13 14:42 UTC (permalink / raw)
To: Dan Carpenter
Cc: Mika Westerberg, Heikki Krogerus, linux-gpio, kernel-janitors
On Tue, Feb 7, 2017 at 2:20 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> 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>
Patch applied as obviously correct.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-13 14:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-07 13:20 [patch] pinctrl: intel: unlock on error in intel_config_set_pull() Dan Carpenter
2017-02-07 13:20 ` Dan Carpenter
2017-02-13 14:42 ` Linus Walleij
2017-02-13 14:42 ` Linus Walleij
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.