]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pinctrl: armada-37xx: propagate error from armada_37xx_gpio_get()
authorGabor Juhos <j4g8y7@gmail.com>
Wed, 14 May 2025 19:18:35 +0000 (21:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 27 Jun 2025 10:05:32 +0000 (11:05 +0100)
[ Upstream commit 57273ff8bb16f3842c2597b5bbcd49e7fa12edf7 ]

The regmap_read() function can fail, so propagate its error up to
the stack instead of silently ignoring that.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
Link: https://lore.kernel.org/20250514-pinctrl-a37xx-fixes-v2-4-07e9ac1ab737@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

index 9c8ed5a03a825d239b97a09fef94bc7d3c6ffd89..e0dbac0c9227a693d7ae8d080c1391c3f8e4cfb7 100644 (file)
@@ -439,11 +439,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(&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;
 }