Skip to content

Commit 643fe70

Browse files
lategoodbyearndb
authored andcommitted
ARM: sun9i: smp: fix return code check of of_property_match_string
of_property_match_string returns an int; either an index from 0 or greater if successful or negative on failure. Even it's very unlikely that the DT CPU node contains multiple enable-methods these checks should be fixed. This patch was inspired by the work of Nick Desaulniers. Link: https://lore.kernel.org/lkml/20230516-sunxi-v1-1-ac4b9651a8c1@google.com/T/ Cc: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Link: https://lore.kernel.org/r/20231228193903.9078-2-wahrenst@gmx.net Reviewed-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 72ad3b7 commit 643fe70

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/mach-sunxi/mc_smp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,12 +803,12 @@ static int __init sunxi_mc_smp_init(void)
803803
for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) {
804804
ret = of_property_match_string(node, "enable-method",
805805
sunxi_mc_smp_data[i].enable_method);
806-
if (!ret)
806+
if (ret >= 0)
807807
break;
808808
}
809809

810810
of_node_put(node);
811-
if (ret)
811+
if (ret < 0)
812812
return -ENODEV;
813813

814814
is_a83t = sunxi_mc_smp_data[i].is_a83t;

0 commit comments

Comments
 (0)