MIPS: generic: Fix machine compatible matching

Web:        https://git.kernel.org/torvalds/c/9a9ab3078e2744a1a55163cfaec73a5798aae33e
Commit:     9a9ab3078e2744a1a55163cfaec73a5798aae33e
Parent:     6045f241b48f07b2fb80905bf49671f457a8c037
Refname:    refs/heads/master
Author:     James Hogan <[email protected]>
AuthorDate: Fri Feb 2 22:14:09 2018 +0000
Committer:  James Hogan <[email protected]>
CommitDate: Mon Feb 5 10:37:48 2018 +0000

    MIPS: generic: Fix machine compatible matching
    
    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 <[email protected]>
    Reviewed-by: Paul Burton <[email protected]>
    Reviewed-by: Matt Redfearn <[email protected]>
    Cc: Ralf Baechle <[email protected]>
    Cc: [email protected]
    Patchwork: https://patchwork.linux-mips.org/patch/18580/
---
 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;
 	}
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html