tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: SAUCE: gpio: aggregator: Fix gpio_aggregator_line_alloc() checking

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2103496

The gpio_aggregator_line_alloc() function returns error pointers, but
the callers check for NULL.  Update the error checking in the callers.

Fixes: 83c8e3df642f ("gpio: aggregator: expose aggregator created via legacy sysfs to configfs")
Signed-off-by: Dan Carpenter<dan.carpenter@linaro.org>
Acked-by: Koichiro Den<koichiro.den@canonical.com>
Link:https://lore.kernel.org/r/cc71d8cf6e9bb4bb8cd9ae5050100081891d9345.1744452787.git.dan.carpenter@linaro.org
Signed-off-by: Bartosz Golaszewski<brgl@bgdev.pl>

(cherry picked from commit 2e8636ca340002f3ac31383622911a1aa75fb086 gpio/for-next)
Signed-off-by: Koichiro Den<koichiro.den@canonical.com>
Acked-by: Jacob Martin <jacob.martin@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Dan Carpenter
2025-04-15 08:14:00 +02:00
committed by Stefan Bader
parent aa5ee24760
commit 1019fb4262
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpio/gpio-aggregator.c
+6 -6
View File
@@ -972,8 +972,8 @@ gpio_aggregator_device_make_group(struct config_group *group, const char *name)
return ERR_PTR(-EINVAL);
line = gpio_aggregator_line_alloc(aggr, idx, NULL, -1);
if (!line)
return ERR_PTR(-ENOMEM);
if (IS_ERR(line))
return ERR_CAST(line);
config_group_init_type_name(&line->group, name, &gpio_aggregator_line_type);
@@ -1062,8 +1062,8 @@ static int gpio_aggregator_parse(struct gpio_aggregator *aggr)
/* Named GPIO line */
scnprintf(name, sizeof(name), "line%u", n);
line = gpio_aggregator_line_alloc(aggr, n, key, -1);
if (!line) {
error = -ENOMEM;
if (IS_ERR(line)) {
error = PTR_ERR(line);
goto err;
}
config_group_init_type_name(&line->group, name,
@@ -1093,8 +1093,8 @@ static int gpio_aggregator_parse(struct gpio_aggregator *aggr)
for_each_set_bit(i, bitmap, AGGREGATOR_MAX_GPIOS) {
scnprintf(name, sizeof(name), "line%u", n);
line = gpio_aggregator_line_alloc(aggr, n, key, i);
if (!line) {
error = -ENOMEM;
if (IS_ERR(line)) {
error = PTR_ERR(line);
goto err;
}
config_group_init_type_name(&line->group, name,