openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

'ret' should be returned while pmic_mpp_write_mode_ctl fails.

Fixes: 0e948042c4 ("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>
This commit is contained in:
YueHaibing 2018-09-20 01:58:18 +00:00 committed by Linus Walleij
parent c98b0d2db7
commit 69f8455f6c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
View File

@ -319,6 +319,8 @@ static int pmic_mpp_set_mux(struct pinctrl_dev *pctldev, unsigned function,
pad->function = function; pad->function = function;
ret = pmic_mpp_write_mode_ctl(state, pad); ret = pmic_mpp_write_mode_ctl(state, pad);
if (ret < 0)
return ret;
val = pad->is_enabled << PMIC_MPP_REG_MASTER_EN_SHIFT; val = pad->is_enabled << PMIC_MPP_REG_MASTER_EN_SHIFT;