lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 123/161] MIPS: generic: Fix machine compatible matching
    Date
    From: James Hogan <jhogan@kernel.org>

    [ 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 <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/
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    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;
    }
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 04:59    [W:4.169 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site