diff mbox series

[SRU,P,v2,4/6] UBUNTU: SAUCE: gpio: aggregator: Fix error code in gpio_aggregator_activate()

Message ID 998d535919806ab06ebbad5ee95ec4a8c4d595d2.1744694723.git.koichiro.den@canonical.com
State New
Headers show
Series Introduce configfs-based interface for gpio-aggregator (LP: #2103496) | expand

Commit Message

Koichiro Den April 15, 2025, 6:13 a.m. UTC 
From: Dan Carpenter <dan.carpenter@linaro.org>

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

Propagate the error code if gpio_aggregator_make_device_sw_node() fails.
Don't return success.

Fixes: 86f162e73d2d ("gpio: aggregator: introduce basic configfs interface")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Acked-by: Koichiro Den <koichiro.den@canonical.com>
Link: https://lore.kernel.org/r/79b804a0769a434698616bebedacc0e5d5605fdc.1744452787.git.dan.carpenter@linaro.org
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
(backported from commit 05b43de95add3d787a7a88378086bf01c10b3f40 gpio/for-next)
[koichiroden: adjusted context because Plucky already includes v6 patch
series, where relevant functions naming differs from v7]
Signed-off-by: Koichiro Den <koichiro.den@canonical.com>
---
 drivers/gpio/gpio-aggregator.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-aggregator.c b/drivers/gpio/gpio-aggregator.c
index da6cf09cea8e..59c6df69faa7 100644
--- a/drivers/gpio/gpio-aggregator.c
+++ b/drivers/gpio/gpio-aggregator.c
@@ -615,8 +615,10 @@  static int aggr_activate(struct gpio_aggregator *aggr)
 		return -ENOMEM;
 
 	swnode = aggr_make_device_swnode(aggr);
-	if (IS_ERR(swnode))
+	if (IS_ERR(swnode)) {
+		ret = PTR_ERR(swnode);
 		goto err_remove_lookups;
+	}
 
 	memset(&pdevinfo, 0, sizeof(pdevinfo));
 	pdevinfo.name = DRV_NAME;