projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e459a89
)
powerpc/prom_init: Fix improper check of prom_getprop()
author
Peiwei Hu
<jlu.hpw@foxmail.com>
Fri, 19 Nov 2021 09:12:18 +0000
(17:12 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 27 Jan 2022 10:04:06 +0000
(11:04 +0100)
[ 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 <jlu.hpw@foxmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link:
https://lore.kernel.org/r/tencent_BA28CC6897B7C95A92EB8C580B5D18589105@qq.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/kernel/prom_init.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/prom_init.c
b/arch/powerpc/kernel/prom_init.c
index
18b04b0
..
f845065
100644
(file)
--- 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;
/*