diff mbox series

[for,4.4,and,4.9] mtd: Fix comparison in map_word_andequal()

Message ID 20200924100054.367518-1-nobuhiro1.iwamatsu@toshiba.co.jp
State New
Headers show
Series [for,4.4,and,4.9] mtd: Fix comparison in map_word_andequal() | expand

Commit Message

Nobuhiro Iwamatsu Sept. 24, 2020, 10 a.m. UTC 
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>
---
 include/linux/mtd/map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.28.0

Comments

Sasha Levin Sept. 24, 2020, 11:15 p.m. UTC | #1 
On Thu, Sep 24, 2020 at 07:00:54PM +0900, Nobuhiro Iwamatsu wrote:
>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>

Queued up, thanks!
diff mbox series

Patch

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