diff -ur linux-2.6.15.4.mtd-git/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.15.4/drivers/mtd/chips/cfi_cmdset_0001.c
--- linux-2.6.15.4.mtd-git/drivers/mtd/chips/cfi_cmdset_0001.c	2006-02-21 15:23:34.000000000 +0100
+++ linux-2.6.15.4/drivers/mtd/chips/cfi_cmdset_0001.c	2006-02-22 11:48:29.000000000 +0100
@@ -408,6 +408,7 @@
 		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_intelext_chipdrv;