summaryrefslogtreecommitdiff
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-21 16:36:17 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-12-26 22:28:39 +0100
commitb9164f049339006fafe8a52396e0f1997552214a (patch)
tree8bd7545be498038576a36f6a55433fd6936d7372 /drivers/pinctrl
parent464231fb1fb1360399a2eb11479c47e39facb030 (diff)
gpio: ssbi-mpp: Be sure to clamp return value
As we want gpio_chip .get() calls to be able to return negative error codes and propagate to drivers, we need to go over all drivers and make sure their return values are clamped to [0,1]. We do this by using the ret = !!(val) design pattern. This code was also double-inverting a bool which makes no sense so I removed that code and moved clamping toward the end. Cc: Björn 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-ssbi-mpp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
index 8f5c96cbf94e..23089d541230 100644
--- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
+++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
@@ -502,13 +502,13 @@ static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset)
int ret;
if (!pin->input)
- return pin->output_value;
+ return !!pin->output_value;
ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state);
if (!ret)
- ret = !!state;
+ ret = state;
- return ret;
+ return !!ret;
}
static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int value)