lkml.org 
[lkml]   [2020]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 005/121] mtd: Fix comparison in map_word_andequal()
    Date
    From: Ben Hutchings <ben@decadent.org.uk>

    commit ea739a287f4f16d6250bea779a1026ead79695f2 upstream.

    Commit 9e343e87d2c4 ("mtd: cfi: convert inline functions to macros")
    changed map_word_andequal() into a macro, but also changed the right
    hand side of the comparison from val3 to val2. Change it back to use
    val3 on the right hand side.

    Thankfully this did not cause a regression because all callers
    currently pass the same argument for val2 and val3.

    Fixes: 9e343e87d2c4 ("mtd: cfi: convert inline functions to macros")
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
    Signed-off-by: Nobuhiro Iwamatsu (CIP) <noburhio1.nobuhiro@toshiba.co.jp>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/mtd/map.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/include/linux/mtd/map.h
    +++ b/include/linux/mtd/map.h
    @@ -312,7 +312,7 @@ void map_destroy(struct mtd_info *mtd);
    ({ \
    int i, ret = 1; \
    for (i = 0; i < map_words(map); i++) { \
    - if (((val1).x[i] & (val2).x[i]) != (val2).x[i]) { \
    + if (((val1).x[i] & (val2).x[i]) != (val3).x[i]) { \
    ret = 0; \
    break; \
    } \

    \
     
     \ /
      Last update: 2020-09-29 13:08    [W:4.361 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site