mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-07 10:29:52 +00:00
pinctrl: at91: fix a couple NULL vs IS_ERR() checks
The devm_kasprintf_strarray() function doesn't return NULL on error,
it returns error pointers. Update the checks accordingly.
Fixes: f494c1913c ("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>
This commit is contained in:
committed by
Linus Walleij
parent
772be1da8e
commit
35216718c9
@@ -1389,8 +1389,8 @@ static int at91_pinctrl_probe(struct platform_device *pdev)
|
|||||||
char **names;
|
char **names;
|
||||||
|
|
||||||
names = devm_kasprintf_strarray(dev, "pio", MAX_NB_GPIO_PER_BANK);
|
names = devm_kasprintf_strarray(dev, "pio", MAX_NB_GPIO_PER_BANK);
|
||||||
if (!names)
|
if (IS_ERR(names))
|
||||||
return -ENOMEM;
|
return PTR_ERR(names);
|
||||||
|
|
||||||
for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {
|
for (j = 0; j < MAX_NB_GPIO_PER_BANK; j++, k++) {
|
||||||
char *name = names[j];
|
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);
|
names = devm_kasprintf_strarray(dev, "pio", chip->ngpio);
|
||||||
if (!names)
|
if (IS_ERR(names))
|
||||||
return -ENOMEM;
|
return PTR_ERR(names);
|
||||||
|
|
||||||
for (i = 0; i < chip->ngpio; i++)
|
for (i = 0; i < chip->ngpio; i++)
|
||||||
strreplace(names[i], '-', alias_idx + 'A');
|
strreplace(names[i], '-', alias_idx + 'A');
|
||||||
|
|||||||
Reference in New Issue
Block a user