diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-09-20 01:58:18 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-13 11:16:50 -0800 |
| commit | 8bcc01ae1a4a08200b895a30b587c417fe851f22 (patch) | |
| tree | 2afda80fbc5b2d5d4030d1e976f2f68e78ede541 /drivers/pinctrl | |
| parent | 24395d641d0297ac89e832a5d699f58ab1b73684 (diff) | |
| download | linux-stable-8bcc01ae1a4a08200b895a30b587c417fe851f22.tar.gz linux-stable-8bcc01ae1a4a08200b895a30b587c417fe851f22.tar.bz2 linux-stable-8bcc01ae1a4a08200b895a30b587c417fe851f22.zip | |
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: 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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c b/drivers/pinctrl/qcom/pinctrl-spmi-mpp.c index 6556dbeae65e..418bc40df7ca 100644 --- 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; |