diff options
| author | Ivan T. Ivanov <ivan.ivanov@linaro.org> | 2015-04-09 18:18:36 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-04-28 14:51:45 +0200 |
| commit | 24a66618d63548e1012bf65ed30a3c031f410ca2 (patch) | |
| tree | 57b8dc804e41f821fe51fb1ac45b287e397f0dab /drivers/pinctrl | |
| parent | 982df6aec06479c844f46f7a5cc960151f8fc005 (diff) | |
| download | linux-24a66618d63548e1012bf65ed30a3c031f410ca2.tar.gz linux-24a66618d63548e1012bf65ed30a3c031f410ca2.tar.bz2 linux-24a66618d63548e1012bf65ed30a3c031f410ca2.zip | |
pinctrl: qcom-spmi-gpio: Fix input value report
Read input buffer when input is enabled, not when it is
disabled. Also fix interpretation of the pmic_gpio_read()
return code, negative value means an error.
Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index 4b21aac43216..e8b74c69222e 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -466,12 +466,13 @@ static void pmic_gpio_config_dbg_show(struct pinctrl_dev *pctldev, seq_puts(s, " ---"); } else { - if (!pad->input_enabled) { + if (pad->input_enabled) { ret = pmic_gpio_read(state, pad, PMIC_MPP_REG_RT_STS); - if (!ret) { - ret &= PMIC_MPP_REG_RT_STS_VAL_MASK; - pad->out_value = ret; - } + if (ret < 0) + return; + + ret &= PMIC_MPP_REG_RT_STS_VAL_MASK; + pad->out_value = ret; } seq_printf(s, " %-4s", pad->output_enabled ? "out" : "in"); |