Skip to contentSkip to conversation

mtd: Fix comparison in map_word_andequal()

PATCH Applied Ben Hutchings 2 participants 2 messages May 10, 2018 – May 12, 2018 Memory technology devices (MTD)

lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 include/linux/mtd/map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mtd/map.h +1 -1
index b5b43f94f311..01b990e4b228 100644
@@ -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;						\
 		}							\
Applied
#1 lore raw
Quoted 10 lines · On Thu, 10 May 2018 19:20:54 +0100 Ben Hutchings <[email protected]> wrote:

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 <[email protected]>

Applied.

Thanks,

Boris

Quoted 17 lines
---
 include/linux/mtd/map.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mtd/map.h +1 -1
index b5b43f94f311..01b990e4b228 100644
@@ -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;						\
 		}							\