Skip to content

Commit 012364f

Browse files
Fix dt-overlay patch: not enter err_revert statement during standart code execution flow
1 parent cbec250 commit 012364f

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

onion/patches/253-ramips-add-dt-overlay-configfs-support.patch

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814
+ info.
815815
--- /dev/null
816816
+++ b/target/linux/ramips/patches-5.15/398-065-of-overlay-add-per-overlay-sysfs-attributes.patch
817-
@@ -0,0 +1,230 @@
817+
@@ -0,0 +1,231 @@
818818
+--- a/drivers/of/overlay.c
819819
++++ b/drivers/of/overlay.c
820820
+@@ -25,6 +25,20 @@
@@ -1022,21 +1022,22 @@
10221022
+
10231023
+ ret = __of_changeset_apply_notify(&ovcs->cset);
10241024
+ if (ret)
1025-
+@@ -1025,6 +1103,13 @@ static int of_overlay_apply(struct overlay_changeset *ovcs)
1026-
+ if (!ret)
1027-
+ ret = ret_tmp;
1025+
+@@ -1028,6 +1106,14 @@ static int of_overlay_apply(struct overlay_changeset *ovcs)
1026+
+ out:
1027+
+ pr_debug("%s() err=%d\n", __func__, ret);
10281028
+
1029+
++ return ret;
10291030
++err_revert:
10301031
++ ret_tmp = 0;
10311032
++ ret_revert = __of_changeset_revert_entries(&ovcs->cset, &ret_tmp);
10321033
++ if (ret_revert) {
10331034
++ pr_debug("overlay changeset revert error %d\n", ret_revert);
10341035
++ devicetree_state_flags |= DTSF_REVERT_FAIL;
10351036
++ }
1036-
+ out:
1037-
+ pr_debug("%s() err=%d\n", __func__, ret);
1037+
+ return ret;
1038+
+ }
10381039
+
1039-
+@@ -1264,6 +1349,8 @@ int of_overlay_remove(int *ovcs_id)
1040+
+@@ -1264,6 +1350,8 @@ int of_overlay_remove(int *ovcs_id)
10401041
+ if (ret)
10411042
+ goto err_unlock;
10421043
+

0 commit comments

Comments
 (0)