aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-01-05 05:52:26 -0500
committerLinus Walleij <linus.walleij@linaro.org>2018-01-09 08:48:34 -0500
commitb67ecdec45b43a0c17a2e66e4d72303dfa3a8a96 (patch)
tree00874bef53b6ac27d8ee3f53bb5f10f0dd7923c7
parent55b6986ca1571b3f47706f84d89126fd35d5de08 (diff)
pinctrl: remove redundant mux_setting clear in pinmux_disable_setting()
desc->mux_setting is set to NULL in pin_free() called just below. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/pinmux.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
index 55502fc4479c..82b18ef44ee4 100644
--- a/drivers/pinctrl/pinmux.c
+++ b/drivers/pinctrl/pinmux.c
@@ -493,8 +493,6 @@ void pinmux_disable_setting(const struct pinctrl_setting *setting)
493 continue; 493 continue;
494 } 494 }
495 if (desc->mux_setting == &(setting->data.mux)) { 495 if (desc->mux_setting == &(setting->data.mux)) {
496 desc->mux_setting = NULL;
497 /* And release the pin */
498 pin_free(pctldev, pins[i], NULL); 496 pin_free(pctldev, pins[i], NULL);
499 } else { 497 } else {
500 const char *gname; 498 const char *gname;