summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2018-01-05 11:52:26 +0100
committerLinus Walleij <linus.walleij@linaro.org>2018-01-09 14:48:34 +0100
commitb67ecdec45b43a0c17a2e66e4d72303dfa3a8a96 (patch)
tree00874bef53b6ac27d8ee3f53bb5f10f0dd7923c7 /drivers/pinctrl
parentMerge tag 'sh-pfc-for-v4.16-tag2' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-b67ecdec45b43a0c17a2e66e4d72303dfa3a8a96.tar.xz
linux-b67ecdec45b43a0c17a2e66e4d72303dfa3a8a96.zip
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>
Diffstat (limited to 'drivers/pinctrl')
-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)
continue;
}
if (desc->mux_setting == &(setting->data.mux)) {
- desc->mux_setting = NULL;
- /* And release the pin */
pin_free(pctldev, pins[i], NULL);
} else {
const char *gname;