Commit 1a744358 authored Sep 20, 2018 by YueHaibing Committed by Greg Kroah-Hartman Nov 13, 2018

pinctrl: qcom: spmi-mpp: Fix err handling of pmic_mpp_set_mux



[ Upstream commit 69f8455f6cc78fa6cdf80d0105d7a748106271dc ]

'ret' should be returned while pmic_mpp_write_mode_ctl fails.

Fixes: 0e948042 ("pinctrl: qcom: spmi-mpp: Implement support for sink mode")
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d2a76333

drivers/pinctrl/qcom/pinctrl-spmi-mpp.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,8 @@ static int pmic_mpp_set_mux(struct pinctrl_dev *pctldev, unsigned function,
		pad->function = function;

		ret = pmic_mpp_write_mode_ctl(state, pad);
		if (ret < 0)
		return ret;

		val = pad->is_enabled << PMIC_MPP_REG_MASTER_EN_SHIFT;