cfi fix for possible oops on Intel P30 flashes, fwd from akpm

diff --git a/queue/cfi-init-wait-queue-in-chip-struct.patch b/queue/cfi-init-wait-queue-in-chip-struct.patch
new file mode 100644 (file)
index 0000000..40c5c33
--- /dev/null
+++ b/queue/cfi-init-wait-queue-in-chip-struct.patch
@@ -0,0 +1,33 @@
+From stable-bounces@linux.kernel.org  Fri Feb 24 13:08:14 2006
+Date: Fri, 24 Feb 2006 13:04:09 -0800
+From: akpm@osdl.org
+To: torvalds@osdl.org
+Cc: simon.vogl@researchstudios.at, tglx@linutronix.de, stable@kernel.org
+Subject: [PATCH] cfi: init wait queue in chip struct
+
+
+From: Simon Vogl <simon.vogl@researchstudios.at>
+
+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 <tglx@linutronix.de>
+Cc: <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ 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;

diff --git a/queue/series b/queue/series
index e5e1ec78c622afc0b9e7651e63e56593ba87d81d..c797575de69fa65cbba9a12cb51b9dafde62834b 100644 (file)
--- a/queue/series
+++ b/queue/series
@@ -20,3 +20,4 @@ it87-fix-oops-on-removal.patch
 hwmon-it87-probe-i2c-0x2d-only.patch
 fix-snd-usb-audio-in-32-bit-compat-environment.patch
 alsa-fix-bogus-snd_device_free-in-opl3-oss.c.patch
+cfi-init-wait-queue-in-chip-struct.patch