From f46a16c4ec4fb21ff4ae121b8dddf545f99b37f5 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 6 Dec 2006 21:52:32 +0200 Subject: [PATCH] --- yaml --- r: 45683 b: refs/heads/master c: 4a0c50c07a6100ca58d465bac951533347e18d71 h: refs/heads/master i: 45681: c96e7b69c19a578aa8564cea9e08c3614156d8bb 45679: 9008114bff1164ce74f98d2b90eeb363486005d0 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nandsim.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b4bfd4258be..239da547edc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 418b2e56b8a61ea85f7a9c5d327e1a2c61d1b2db +refs/heads/master: 4a0c50c07a6100ca58d465bac951533347e18d71 diff --git a/trunk/drivers/mtd/nand/nandsim.c b/trunk/drivers/mtd/nand/nandsim.c index 3d39451ae8f5..c3bca9590ad2 100644 --- a/trunk/drivers/mtd/nand/nandsim.c +++ b/trunk/drivers/mtd/nand/nandsim.c @@ -160,7 +160,7 @@ MODULE_PARM_DESC(dbg, "Output debug information if not zero"); /* After a command is input, the simulator goes to one of the following states */ #define STATE_CMD_READ0 0x00000001 /* read data from the beginning of page */ #define STATE_CMD_READ1 0x00000002 /* read data from the second half of page */ -#define STATE_CMD_READSTART 0x00000003 /* read data second command (large page devices) */ +#define STATE_CMD_READSTART 0x00000003 /* read data second command (large page devices) */ #define STATE_CMD_PAGEPROG 0x00000004 /* start page programm */ #define STATE_CMD_READOOB 0x00000005 /* read OOB area */ #define STATE_CMD_ERASE1 0x00000006 /* sector erase first command */ @@ -440,7 +440,7 @@ static int init_nandsim(struct mtd_info *mtd) } } else { if (ns->geom.totsz <= (128 << 20)) { - ns->geom.pgaddrbytes = 5; + ns->geom.pgaddrbytes = 4; ns->geom.secaddrbytes = 2; } else { ns->geom.pgaddrbytes = 5;