OSDN Git Service

pinctrl: at91: fix a couple NULL vs IS_ERR() checks
authorDan Carpenter <dan.carpenter@linaro.org>
Mon, 22 May 2023 07:44:54 +0000 (10:44 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Wed, 24 May 2023 08:51:30 +0000 (10:51 +0200)
The devm_kasprintf_strarray() function doesn't return NULL on error,
it returns error pointers.  Update the checks accordingly.

Fixes: f494c1913cbb ("pinctrl: at91: use devm_kasprintf() to avoid potential leaks (part 2)")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Ryan Wanner <ryan.wanner@microchip.com>
Link: https://lore.kernel.org/r/5697980e-f687-47a7-9db8-2af34ae464bd@kili.mountain
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-at91.c

index 871209c..39956d8 100644 (file)
@@ -1389,8 +1389,8 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
                char **names;
 
                names = devm_kasprintf_strarray(dev, "pio", MAX_NB_GPIO_PER_BANK);
-               if (!names)
-                       return -ENOMEM;
+               if (IS_ERR(names))
+                       return PTR_ERR(names);
 
                for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {
                        char *name = names[j];
@@ -1870,8 +1870,8 @@ static int at91_gpio_probe(struct platform_device *pdev)
        }
 
        names = devm_kasprintf_strarray(dev, "pio", chip->ngpio);
-       if (!names)
-               return -ENOMEM;
+       if (IS_ERR(names))
+               return PTR_ERR(names);
 
        for (i = 0; i < chip->ngpio; i++)
                strreplace(names[i], '-', alias_idx + 'A');