| From foo@baz Sat Nov 10 11:24:34 PST 2018 |
| From: YueHaibing <yuehaibing@huawei.com> |
| Date: Thu, 20 Sep 2018 01:58:18 +0000 |
| Subject: pinctrl: qcom: spmi-mpp: Fix err handling of pmic_mpp_set_mux |
| |
| From: YueHaibing <yuehaibing@huawei.com> |
| |
| [ Upstream commit 69f8455f6cc78fa6cdf80d0105d7a748106271dc ] |
| |
| '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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- 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 pinct |
| 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; |
| |
