mtd: Fix comparison in map_word_andequal()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=22dac5a89308855ae07fedd9ef4a8cefc10a974b
Commit:     22dac5a89308855ae07fedd9ef4a8cefc10a974b
Parent:     3057fcef385348fe85173f1b0c824d89f1176f72
Author:     Ben Hutchings <ben at decadent.org.uk>
AuthorDate: Thu May 10 19:20:54 2018 +0100
Committer:  Boris Brezillon <boris.brezillon at bootlin.com>
CommitDate: Sat May 12 10:15:27 2018 +0200

    mtd: Fix comparison in map_word_andequal()
    
    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 at decadent.org.uk>
    Signed-off-by: Boris Brezillon <boris.brezillon at bootlin.com>
---
 include/linux/mtd/map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index b5b43f94f311..01b990e4b228 100644
--- 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;						\
 		}							\