From: Denis V. Lunev <den@parallels.com>
Date: Wed, 3 Dec 2008 10:47:20 +0000 (+0000)
Subject: [MTD] [NAND] fix OOPS accessing flash operations over STM flash on PXA
X-Git-Tag: v2.6.28-rc8~35^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e93f1be503efd0e44e46fc1fd4c13dbee72a6561;p=linux-2.6-omap-h63xx.git

[MTD] [NAND] fix OOPS accessing flash operations over STM flash on PXA

STM 2Gb flash is a large-page NAND flash.  Set operations accordingly.
This field is dereferenced without a check in several places resulting in
OOPS.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Eric Miao <ymiao3@marvell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index c0fa9c9edf0..15f0a26730a 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = {
 
 static struct pxa3xx_nand_flash stm2GbX16 = {
 	.timing = &stm2GbX16_timing,
+	.cmdset	= &largepage_cmdset,
 	.page_per_block = 64,
 	.page_size = 2048,
 	.flash_width = 16,