regulator: lm363x: Check return value of gpiod_get_index_optional
authorAxel Lin <axel.lin@ingics.com>
Fri, 8 Feb 2019 14:11:52 +0000 (22:11 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 8 Feb 2019 16:50:52 +0000 (16:50 +0000)
gpiod_get_index_optional can return ERR_PTR, add IS_ERR checking for it.
While at it, also remove a redundant NULL test for gpiod in error path.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/lm363x-regulator.c

index 8c0e8419c43f08a75239bcd580f7f65aa2dcd420..c876e161052abcca2c131b79b45da75412f93c1c 100644 (file)
@@ -258,6 +258,9 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
         * Register update is required if the pin is used.
         */
        gpiod = lm363x_regulator_of_get_enable_gpio(dev, id);
+       if (IS_ERR(gpiod))
+               return PTR_ERR(gpiod);
+
        if (gpiod) {
                cfg.ena_gpiod = gpiod;
 
@@ -265,8 +268,7 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
                                         LM3632_EXT_EN_MASK,
                                         LM3632_EXT_EN_MASK);
                if (ret) {
-                       if (gpiod)
-                               gpiod_put(gpiod);
+                       gpiod_put(gpiod);
                        dev_err(dev, "External pin err: %d\n", ret);
                        return ret;
                }