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

Commit 83d48091 authored by Vijay Sampath's avatar Vijay Sampath Committed by David Woodhouse
Browse files

[MTD] [NOR] Fix oops in cfi_amdstd_sync 



The files cfi_cmdset_0002.c and cfi_cmdset_0020.c do not initialize their
wait queues like is done in cfi_cmdset_0001.c.  This causes an oops when
the wait queue is accessed.  I have copied the code from cfi_cmdset_0001.c
that is pertinent to initialization of the wait queue.

Signed-off-by: default avatarVijay Sampath <vsampath@gmail.com>
Acked-by: default avatarJoern Engel <joern@lazybastard.org>
Acked-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent dc164bbb

drivers/mtd/chips/cfi_cmdset_0002.c

+2 −0
Original line number Diff line number Diff line
@@ -359,6 +359,8 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) 
		cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;

		cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;

		cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;

		cfi->chips[i].ref_point_counter = 0;

		init_waitqueue_head(&(cfi->chips[i].wq));

	}



	map->fldrv = &cfi_amdstd_chipdrv;

drivers/mtd/chips/cfi_cmdset_0020.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary) 
		cfi->chips[i].word_write_time = 128;

		cfi->chips[i].buffer_write_time = 128;

		cfi->chips[i].erase_time = 1024;

		cfi->chips[i].ref_point_counter = 0;

		init_waitqueue_head(&(cfi->chips[i].wq));

	}



	return cfi_staa_setup(map);