Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33203f5b authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: qcom: fix up errorpath 



This fixes up:
commit 464231fb
"pinctrl: ssbi-gpio: Be sure to clamp return value"
commit b9164f04
"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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 427e0dc5

drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c

+2 −2
Original line number Diff line number Diff line
@@ -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)