aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mtd/map.h
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-05-10 19:20:54 +0100
committerBoris Brezillon <boris.brezillon@bootlin.com>2018-05-14 14:46:20 +0200
commitea739a287f4f16d6250bea779a1026ead79695f2 (patch)
treef6d61738cb9ee66b8a2771a67e0389125b5f1447 /include/linux/mtd/map.h
parentLinux 4.17-rc5 (diff)
downloadlinux-dev-ea739a287f4f16d6250bea779a1026ead79695f2.tar.xz
linux-dev-ea739a287f4f16d6250bea779a1026ead79695f2.zip
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@decadent.org.uk> Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
Diffstat (limited to '')
-rw-r--r--include/linux/mtd/map.h2
1 files changed, 1 insertions, 1 deletions
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; \
} \