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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e93f1be503efd0e44e46fc1fd4c13dbee72a6561
Commit:     e93f1be503efd0e44e46fc1fd4c13dbee72a6561
Parent:     d94762989103b5e29938d8a7b0112e72c4633265
Author:     Denis V. Lunev <den at parallels.com>
AuthorDate: Wed Dec 3 10:47:20 2008 +0000
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Wed Dec 3 10:47:20 2008 +0000

    [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 at openvz.org>
    Acked-by: Eric Miao <ymiao3 at marvell.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/nand/pxa3xx_nand.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index c0fa9c9..15f0a26 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,