forked from Openwrt-EcoNet/openwrt
831994e258
Backport upstream pinctrl fixes, these are required for the follow-up I2C PXA recovery fixes. Signed-off-by: Robert Marko <robert.marko@sartura.hr>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 6481c0a83367b0672951ccc876fbae7ee37b594b Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <j4g8y7@gmail.com>
|
|
Date: Wed, 14 May 2025 21:18:37 +0200
|
|
Subject: [PATCH 6/7] pinctrl: armada-37xx: propagate error from
|
|
armada_37xx_gpio_get_direction()
|
|
|
|
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-6-07e9ac1ab737@gmail.com
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
|
|
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
|
|
@@ -402,10 +402,13 @@ static int armada_37xx_gpio_get_directio
|
|
struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
|
|
unsigned int reg = OUTPUT_EN;
|
|
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;
|
|
|
|
if (val & mask)
|
|
return GPIO_LINE_DIRECTION_OUT;
|