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

Bartosz Golaszewski · gregkh · commit a37435986ae9 · 2026-05-14T15:31:10.000+02:00
commit bbee90e upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
@@ -1210,7 +1210,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
`@@ -1210,7 +1210,14 @@ int of_gpiochip_add(struct gpio_chip *chip)`
`1210`	`1210`
`1211`	`1211`	`void of_gpiochip_remove(struct gpio_chip *chip)`
`1212`	`1212`	`{`
`1213`		`- of_node_put(dev_of_node(&chip->gpiodev->dev));`
	`1213`	`+ struct device_node *np = dev_of_node(&chip->gpiodev->dev);`
	`1214`	`+`
	`1215`	`+ for_each_child_of_node_scoped(np, child) {`
	`1216`	`+ if (of_property_present(child, "gpio-hog"))`
	`1217`	`+ of_node_clear_flag(child, OF_POPULATED);`
	`1218`	`+ }`
	`1219`	`+`
	`1220`	`+ of_node_put(np);`
`1214`	`1221`	`}`
`1215`	`1222`
`1216`	`1223`	`bool of_gpiochip_instance_match(struct gpio_chip *gc, unsigned int index)`