mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=636fdbf88efe069f9951d1b7df8d3fd82060dc60
Commit:     636fdbf88efe069f9951d1b7df8d3fd82060dc60
Parent:     4612c715a6ea6b3af2aee0163c0721375b2548d7
Author:     Christian Riesch <christian.riesch at omicron.at>
AuthorDate: Tue Mar 31 23:29:22 2015 +0200
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Wed May 27 12:47:37 2015 -0700

    mtd: cfi_cmdset_0002: Initialize datum before calling map_word_load_partial
    
    In do_otp_write we must initialize the variable datum before calling
    map_word_load_partial. Otherwise the upper bits of datum may be undefined,
    which later causes problems in chip_good called by do_write_oneword.
    
    Signed-off-by: Christian Riesch <christian.riesch at omicron.at>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index c50d8cf..c3624eb 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1295,7 +1295,7 @@ static int do_otp_write(struct map_info *map, struct flchip *chip, loff_t adr,
 		unsigned long bus_ofs = adr & ~(map_bankwidth(map)-1);
 		int gap = adr - bus_ofs;
 		int n = min_t(int, len, map_bankwidth(map) - gap);
-		map_word datum;
+		map_word datum = map_word_ff(map);
 
 		if (n != map_bankwidth(map)) {
 			/* partial write of a word, load old contents */