| Message ID | 1451985969-17717-1-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Jan 5, 2016 at 1:26 AM, Linus Walleij <linus.walleij@linaro.org> wrote: > This fixes up: > commit 464231fb1fb1360399a2eb11479c47e39facb030 > "pinctrl: ssbi-gpio: Be sure to clamp return value" > commit b9164f049339006fafe8a52396e0f1997552214a > "gpio: ssbi-mpp: Be sure to clamp return value" > as I managed to screw up some of the logic when clamping > the return values. > Thanks, sorry for being slow with the review in the first place. Reviewed-by: Björn Andersson <bjorn@kryo.se> Regards, Bjorn > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 ++-- > drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c > index 394ca34bec4a..7bea0df06fb1 100644 > --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c > +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c > @@ -487,10 +487,10 @@ static int pm8xxx_gpio_get(struct gpio_chip *chip, unsigned offset) > } else { > 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_gpio_set(struct gpio_chip *chip, unsigned offset, int value) > diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c > index 23089d541230..629642b73489 100644 > --- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c > +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c > @@ -506,9 +506,9 @@ static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset) > > 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) > -- > 2.4.3 > -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c index 394ca34bec4a..7bea0df06fb1 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c @@ -487,10 +487,10 @@ static int pm8xxx_gpio_get(struct gpio_chip *chip, unsigned offset) } else { 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_gpio_set(struct gpio_chip *chip, unsigned offset, int value) diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c index 23089d541230..629642b73489 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c @@ -506,9 +506,9 @@ static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset) 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)
This fixes up: commit 464231fb1fb1360399a2eb11479c47e39facb030 "pinctrl: ssbi-gpio: Be sure to clamp return value" commit b9164f049339006fafe8a52396e0f1997552214a "gpio: ssbi-mpp: Be sure to clamp return value" as I managed to screw up some of the logic when clamping the return values. Cc: Björn Andersson <bjorn@kryo.se> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 ++-- drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)