From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date: Fri, 24 Oct 2025 19:50:58 +0000 (+0200)
Subject: of: overlay: Avoid spurious error messages in of_overlay_remove()
X-Git-Tag: v6.19-rc1~138^2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b012c2ac3745a9d446a2338fb10214ad82df1327;p=thirdparty%2Fkernel%2Flinux.git

of: overlay: Avoid spurious error messages in of_overlay_remove()

Make of_overlay_remove() tolerate ovcs_id being 0 without logging an error.

Suggested-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://patch.msgid.link/f756e04e8bc239b33a0428c2dd055f202e214f0b.1761335298.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---

diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
index 255e8362f600a..5b4f42230e6c9 100644
--- a/drivers/of/overlay.c
+++ b/drivers/of/overlay.c
@@ -1190,6 +1190,9 @@ int of_overlay_remove(int *ovcs_id)
 	struct overlay_changeset *ovcs;
 	int ret, ret_apply, ret_tmp;
 
+	if (*ovcs_id == 0)
+		return 0;
+
 	if (devicetree_corrupt()) {
 		pr_err("suspect devicetree state, refuse to remove overlay\n");
 		ret = -EBUSY;