Message ID | 20250512-pinctrl-a37xx-fixes-v1-4-d470fb1116a5@gmail.com |
---|---|
State | New |
Headers | show |
Series | pinctrl: armada-37xx: a couple of small fixes | expand |
On Mon, May 12, 2025 at 04:22:40PM +0200, Gabor Juhos wrote: > The regmap_read() function can fail, so propagate its error up to > the stack instead of silently ignoring that. > > Cc: stable@vger.kernel.org > Fixes: 5715092a458c ("pinctrl: armada-37xx: Add gpio support") > Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> > Signed-off-by: Imre Kaloz <kaloz@openwrt.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 8d93d36af63ab9496376219454214c05db30971f..2e88a0399d1a205064b58890db6477e2202bf311 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -440,11 +440,14 @@ static int armada_37xx_gpio_get(struct gpio_chip *chip, unsigned int offset) struct armada_37xx_pinctrl *info = gpiochip_get_data(chip); unsigned int reg = INPUT_VAL; unsigned int val, mask; + int ret; armada_37xx_update_reg(®, &offset); mask = BIT(offset); - regmap_read(info->regmap, reg, &val); + ret = regmap_read(info->regmap, reg, &val); + if (ret) + return ret; return (val & mask) != 0; }