Browse Source

pinctrl: qcom: fix up errorpath

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>
Linus Walleij 9 years ago
parent
commit
33203f5b94

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

@@ -487,10 +487,10 @@ static int pm8xxx_gpio_get(struct gpio_chip *chip, unsigned offset)
 	} else {
 	} else {
 		ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state);
 		ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state);
 		if (!ret)
 		if (!ret)
-			ret = state;
+			ret = !!state;
 	}
 	}
 
 
-	return !!ret;
+	return ret;
 }
 }
 
 
 static void pm8xxx_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 static void pm8xxx_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

+ 2 - 2
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);
 	ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state);
 	if (!ret)
 	if (!ret)
-		ret = state;
+		ret = !!state;
 
 
-	return !!ret;
+	return ret;
 }
 }
 
 
 static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int value)
 static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int value)