2006-02-27 22:36:50

by Chris Wright

[permalink] [raw]
Subject: [patch 23/39] [PATCH] cfi: init wait queue in chip struct

-stable review patch. If anyone has any objections, please let us know.
------------------

Fix a kernel oops for Intel P30 flashes, where the wait queue head was not
initialized for the flchip struct, which in turn caused a crash at the
first read operation.

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---

drivers/mtd/chips/cfi_cmdset_0001.c | 1 +
1 files changed, 1 insertion(+)

--- linux-2.6.15.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
+++ linux-2.6.15.4/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -408,6 +408,7 @@ struct mtd_info *cfi_cmdset_0001(struct
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;

--