From: Peiwei Hu Date: Fri, 19 Nov 2021 09:12:18 +0000 (+0800) Subject: powerpc/prom_init: Fix improper check of prom_getprop() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2655590dcdd9863972149446e6e31dc14c0ad7c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git powerpc/prom_init: Fix improper check of prom_getprop() [ Upstream commit 869fb7e5aecbc163003f93f36dcc26d0554319f6 ] prom_getprop() can return PROM_ERROR. Binary operator can not identify it. Fixes: 94d2dde738a5 ("[POWERPC] Efika: prune fixups and make them more carefull") Signed-off-by: Peiwei Hu Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/tencent_BA28CC6897B7C95A92EB8C580B5D18589105@qq.com Signed-off-by: Sasha Levin --- diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index f8782c7ef50f..7f049a60747e 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2774,7 +2774,7 @@ static void __init fixup_device_tree_efika_add_phy(void) /* Check if the phy-handle property exists - bail if it does */ rv = prom_getprop(node, "phy-handle", prop, sizeof(prop)); - if (!rv) + if (rv <= 0) return; /*