Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e3ebb38 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

mtd: Fix comparison in map_word_andequal() 



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: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: default avatarNobuhiro Iwamatsu (CIP) <noburhio1.nobuhiro@toshiba.co.jp>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ff7a7d19

include/linux/mtd/map.h

+1 −1
Original line number Diff line number Diff line
@@ -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;						\

		}							\