diff options
| author |   Joey Gouly <joey.gouly@arm.com> | 2021-11-21 16:56:36 +0000 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2021-11-27 00:55:14 +0100 |
| commit | 3605f104111e4adeac71edc89d867ec56147786d (patch) | |
| tree | 89f8af651e7f59578dea60554b61e94ec2271a99 /drivers/pinctrl/pinctrl-apple-gpio.c | |
| parent | pinctrl: apple: add missing bits.h header (diff) | |
| download | linux-dev-3605f104111e4adeac71edc89d867ec56147786d.tar.xz linux-dev-3605f104111e4adeac71edc89d867ec56147786d.zip | |
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: Joey Gouly <joey.gouly@arm.com>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20211121165642.27883-6-joey.gouly@arm.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-apple-gpio.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-apple-gpio.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/pinctrl/pinctrl-apple-gpio.c b/drivers/pinctrl/pinctrl-apple-gpio.c index cce95367c156..bd7f28150ac0 100644 --- a/drivers/pinctrl/pinctrl-apple-gpio.c +++ b/drivers/pinctrl/pinctrl-apple-gpio.c @@ -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); } -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 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; } |