projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c98b0d2
)
pinctrl: qcom: spmi-mpp: Fix err handling of pmic_mpp_set_mux
author
YueHaibing
<yuehaibing@huawei.com>
Thu, 20 Sep 2018 01:58:18 +0000
(
01:58
+0000)
committer
Linus Walleij
<linus.walleij@linaro.org>
Fri, 21 Sep 2018 15:17:43 +0000
(08:17 -0700)
'ret' should be returned while pmic_mpp_write_mode_ctl fails.
Fixes: 0e948042c420 ("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>
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
patch
|
blob
|
history
diff --git
a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
index 98f6f40274ba750c784bdc80d843cf5e924a95c3..d6ddc47b57ec82183ae4abc1f36acd082e4bf42c 100644
(file)
--- a/
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
+++ b/
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
@@
-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;