diff options
| author | Thomas Gleixner <tglx@cruncher.tec.linutronix.de> | 2006-05-23 06:37:31 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@cruncher.tec.linutronix.de> | 2006-05-23 06:37:31 -0400 |
| commit | 4cbb9b80e171107c6c34116283fe38e5a396c68b (patch) | |
| tree | 9463f2e4774f14752cf4bb52431e14e569256f72 /drivers/mtd/nand/au1550nd.c | |
| parent | 6dfc6d250d0b7ebaa6423c44dcd09fcfe68deabd (diff) | |
| parent | 9fe4854cd1f60273f9a3ece053f4789605f58a5e (diff) | |
Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mtd/nand/au1550nd.c')
| -rw-r--r-- | drivers/mtd/nand/au1550nd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c index d7f04abfe18e..29dde7dcafa1 100644 --- a/drivers/mtd/nand/au1550nd.c +++ b/drivers/mtd/nand/au1550nd.c | |||
| @@ -356,9 +356,9 @@ static void au1550_command(struct mtd_info *mtd, unsigned command, int column, i | |||
| 356 | if (command == NAND_CMD_SEQIN) { | 356 | if (command == NAND_CMD_SEQIN) { |
| 357 | int readcmd; | 357 | int readcmd; |
| 358 | 358 | ||
| 359 | if (column >= mtd->oobblock) { | 359 | if (column >= mtd->writesize) { |
| 360 | /* OOB area */ | 360 | /* OOB area */ |
| 361 | column -= mtd->oobblock; | 361 | column -= mtd->writesize; |
| 362 | readcmd = NAND_CMD_READOOB; | 362 | readcmd = NAND_CMD_READOOB; |
| 363 | } else if (column < 256) { | 363 | } else if (column < 256) { |
| 364 | /* First 256 bytes --> READ0 */ | 364 | /* First 256 bytes --> READ0 */ |