MIPS: generic: Fix machine compatible matching

amalon · amalon · commit 9a9ab3078e27 · 2018-02-05T10:37:48.000Z
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: eed0eab ("MIPS: generic: Introduce generic DT-based board support") Signed-off-by: James Hogan <jhogan@kernel.org> Reviewed-by: Paul Burton <paul.burton@mips.com> Reviewed-by: Matt Redfearn <matt.redfearn@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/18580/
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ mips_machine_is_compatible(const struct mips_machine mach, const void fdt)`
`52`	`52`	`if (!mach->matches)`
`53`	`53`	`return NULL;`
`54`	`54`
`55`		`- for (match = mach->matches; match->compatible; match++) {`
	`55`	`+ for (match = mach->matches; match->compatible[0]; match++) {`
`56`	`56`	`if (fdt_node_check_compatible(fdt, 0, match->compatible) == 0)`
`57`	`57`	`return match;`
`58`	`58`	`}`