Commit 3605f104 authored by Joey Gouly's avatar Joey Gouly Committed by Linus Walleij

pinctrl: apple: handle regmap_read errors

Explicitly return 0 if the regmap_read fails.
Also change a uint32_t to a u32.
Signed-off-by: default avatarJoey Gouly <joey.gouly@arm.com>
Suggested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20211121165642.27883-6-joey.gouly@arm.comSigned-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 7c06f080
...@@ -81,12 +81,16 @@ static void apple_gpio_set_reg(struct apple_gpio_pinctrl *pctl, ...@@ -81,12 +81,16 @@ static void apple_gpio_set_reg(struct apple_gpio_pinctrl *pctl,
regmap_update_bits(pctl->map, REG_GPIO(pin), mask, value); regmap_update_bits(pctl->map, REG_GPIO(pin), mask, value);
} }
static uint32_t apple_gpio_get_reg(struct apple_gpio_pinctrl *pctl, static u32 apple_gpio_get_reg(struct apple_gpio_pinctrl *pctl,
unsigned int pin) unsigned int pin)
{ {
unsigned int val = 0; int ret;
u32 val;
ret = regmap_read(pctl->map, REG_GPIO(pin), &val);
if (ret)
return 0;
regmap_read(pctl->map, REG_GPIO(pin), &val);
return val; return val;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment