From 869fb7e5aecbc163003f93f36dcc26d0554319f6 Mon Sep 17 00:00:00 2001

From: Peiwei Hu <jlu.hpw@foxmail.com>

Date: Fri, 19 Nov 2021 17:12:18 +0800

Subject: [PATCH] powerpc/prom_init: Fix improper check of prom_getprop()

References: bsc#1065729

Patch-mainline: v5.17-rc1

Git-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 <jlu.hpw@foxmail.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/tencent_BA28CC6897B7C95A92EB8C580B5D18589105@qq.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/kernel/prom_init.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c

index 18b04b08b983..f845065c860e 100644

--- a/arch/powerpc/kernel/prom_init.c

+++ b/arch/powerpc/kernel/prom_init.c

@@ -2991,7 +2991,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;

 	/*

-- 

2.31.1