OSDN Git Service

pinctrl: nomadik: silence uninitialized variable warning
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 8 Aug 2018 12:04:49 +0000 (15:04 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Fri, 10 Aug 2018 21:14:04 +0000 (23:14 +0200)
This is harmless, but "val" isn't necessarily initialized if
abx500_get_register_interruptible() fails.  I've re-arranged the code to
just return an error code in that situation.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/nomadik/pinctrl-abx500.c

index aa592ef..e3689cc 100644 (file)
@@ -101,15 +101,16 @@ static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg,
        reg += offset / 8;
        ret = abx500_get_register_interruptible(pct->dev,
                                                AB8500_MISC, reg, &val);
-
-       *bit = !!(val & BIT(pos));
-
-       if (ret < 0)
+       if (ret < 0) {
                dev_err(pct->dev,
                        "%s read reg =%x, offset=%x failed (%d)\n",
                        __func__, reg, offset, ret);
+               return ret;
+       }
 
-       return ret;
+       *bit = !!(val & BIT(pos));
+
+       return 0;
 }
 
 static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,