* [PATCH for 4.4 and 4.9] mtd: Fix comparison in map_word_andequal()
@ 2020-09-24 10:00 Nobuhiro Iwamatsu
2020-09-24 23:15 ` Sasha Levin
0 siblings, 1 reply; 2+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-09-24 10:00 UTC (permalink / raw
To: stable; +Cc: Ben Hutchings, Boris Brezillon, Nobuhiro Iwamatsu
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(-)
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; \
} \
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for 4.4 and 4.9] mtd: Fix comparison in map_word_andequal()
2020-09-24 10:00 [PATCH for 4.4 and 4.9] mtd: Fix comparison in map_word_andequal() Nobuhiro Iwamatsu
@ 2020-09-24 23:15 ` Sasha Levin
0 siblings, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2020-09-24 23:15 UTC (permalink / raw
To: Nobuhiro Iwamatsu
Cc: stable, Ben Hutchings, Boris Brezillon, Nobuhiro Iwamatsu
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!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-24 23:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-24 10:00 [PATCH for 4.4 and 4.9] mtd: Fix comparison in map_word_andequal() Nobuhiro Iwamatsu
2020-09-24 23:15 ` Sasha Levin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.