diff --git a/patch/kernel/sunxi-dev/add_configfs_overlay_for_v4.8.x.patch b/patch/kernel/sunxi-dev/add_configfs_overlay_for_v4.8.x.patch index 226786fa7..006766a22 100644 --- a/patch/kernel/sunxi-dev/add_configfs_overlay_for_v4.8.x.patch +++ b/patch/kernel/sunxi-dev/add_configfs_overlay_for_v4.8.x.patch @@ -358,31 +358,3 @@ index dca8f9b..ec7e167 100644 { int parent, len; const struct of_bus *bus, *pbus; -diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c -index 46325d6..867d1cf 100644 ---- a/drivers/of/resolver.c -+++ b/drivers/of/resolver.c -@@ -321,8 +321,10 @@ int of_resolve_phandles(struct device_node *resolve) - pr_err("%s: node %s not detached\n", __func__, - resolve->full_name); - /* the resolve node must exist, and be detached */ -- if (!resolve || !of_node_check_flag(resolve, OF_DETACHED)) -+ if (!resolve || !of_node_check_flag(resolve, OF_DETACHED)) { -+ pr_err("%s: resolve node must exist, and be detached\n", __func__); - return -EINVAL; -+ } - - /* first we need to adjust the phandles */ - phandle_delta = of_get_tree_max_phandle() + 1; -@@ -338,8 +340,10 @@ int of_resolve_phandles(struct device_node *resolve) - /* resolve root is guaranteed to be the '/' */ - err = __of_adjust_tree_phandle_references(childroot, - resolve, 0); -- if (err != 0) -+ if (err != 0) { -+ pr_err("%s: __of_adjust_tree_phandle_references failed !\n", __func__); - return err; -+ } - - BUG_ON(__of_adjust_tree_phandle_references(childroot, - resolve, phandle_delta));