From: Xu Qiang Date: Mon, 1 Aug 2022 12:05:06 +0000 (+0000) Subject: of/fdt: declared return type does not match actual return type X-Git-Tag: v6.0-rc1~122^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7913145afa51bbed9eaf8e5b4ee55fa9884a71e5;p=thirdparty%2Flinux.git of/fdt: declared return type does not match actual return type The commit 649cab56de8e (“of: properly check for error returned by fdt_get_name()”) changed the return value type from bool to int, but forgot to change the return value simultaneously. populate_node was only called in unflatten_dt_nodes, and returns with values greater than or equal to 0 were discarded without further processing. Considering that return 0 usually indicates success, return 0 instead of return true. Fixes: 649cab56de8e (“of: properly check for error returned by fdt_get_name()”) Signed-off-by: Xu Qiang Signed-off-by: Rob Herring Link: https://lore.kernel.org/r/20220801120506.11461-2-xuqiang36@huawei.com --- diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 872b7b54e197d..e02a30c927191 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -246,7 +246,7 @@ static int populate_node(const void *blob, } *pnp = np; - return true; + return 0; } static void reverse_nodes(struct device_node *parent)