gpio: of: clear OF_POPULATED on hog nodes in remove path

Bartosz Golaszewski · Bartosz Golaszewski · commit bbee90e75026 · 2026-03-16T09:51:05.000+01:00
The previously set OF_POPULATED flag should be cleared on the hog nodes when removing the chip. Cc: stable@vger.kernel.org Fixes: 63636d9 ("gpio: of: Add DT overlay support for GPIO hogs") Acked-by: Linus Walleij <linusw@kernel.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20260309-gpio-hog-fwnode-v2-1-4e61f3dbf06a@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
@@ -1187,7 +1187,14 @@ int of_gpiochip_add(struct gpio_chip *chip)
 
 void of_gpiochip_remove(struct gpio_chip *chip)
 {
-	of_node_put(dev_of_node(&chip->gpiodev->dev));
+	struct device_node *np = dev_of_node(&chip->gpiodev->dev);
+
+	for_each_child_of_node_scoped(np, child) {
+		if (of_property_present(child, "gpio-hog"))
+			of_node_clear_flag(child, OF_POPULATED);
+	}
+
+	of_node_put(np);
 }
 
 bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index)

Original file line number	Diff line number	Diff line change
`@@ -1187,7 +1187,14 @@ int of_gpiochip_add(struct gpio_chip *chip)`
`1187`	`1187`
`1188`	`1188`	`void of_gpiochip_remove(struct gpio_chip *chip)`
`1189`	`1189`	`{`
`1190`		`- of_node_put(dev_of_node(&chip->gpiodev->dev));`
	`1190`	`+ struct device_node *np = dev_of_node(&chip->gpiodev->dev);`
	`1191`	`+`
	`1192`	`+ for_each_child_of_node_scoped(np, child) {`
	`1193`	`+ if (of_property_present(child, "gpio-hog"))`
	`1194`	`+ of_node_clear_flag(child, OF_POPULATED);`
	`1195`	`+ }`
	`1196`	`+`
	`1197`	`+ of_node_put(np);`
`1191`	`1198`	`}`
`1192`	`1199`
`1193`	`1200`	`bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index)`