From: James Hogan <>

[ Upstream commit 9a9ab3078e2744a1a55163cfaec73a5798aae33e ]

We now have a platform (Ranchu) in the "generic" platform which matches
based on the FDT compatible string using mips_machine_is_compatible(),
however that function doesn't stop at a blank struct
of_device_id::compatible as that is an array in the struct, not a
pointer to a string.

Fix the loop completion to check the first byte of the compatible array
rather than the address of the compatible array in the struct.

Fixes: eed0eabd12ef ("MIPS: generic: Introduce generic DT-based board support")
Signed-off-by: James Hogan <>
Reviewed-by: Paul Burton <>
Reviewed-by: Matt Redfearn <>
Cc: Ralf Baechle <>
Signed-off-by: Sasha Levin <>
 arch/mips/include/asm/machine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/machine.h b/arch/mips/include/asm/machine.h
index e0d9b373d415..f83879dadd1e 100644
--- a/arch/mips/include/asm/machine.h
+++ b/arch/mips/include/asm/machine.h
@@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct mips_machine *mach, 
const void *fdt)
        if (!mach->matches)
                return NULL;
-       for (match = mach->matches; match->compatible; match++) {
+       for (match = mach->matches; match->compatible[0]; match++) {
                if (fdt_node_check_compatible(fdt, 0, match->compatible) == 0)
                        return match;

Reply via email to