From 87f04ea2096e27a887a58e2883b075d85adb55a1 Mon Sep 17 00:00:00 2001 From: Rohit Hassan Sathyanarayan Date: Fri, 23 Jul 2010 12:29:25 +0530 Subject: [PATCH] --- yaml --- r: 207770 b: refs/heads/master c: 42b0aab1cc30b2fa7e0a99b832bd1b5c9b59757d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/onenand/onenand_base.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6056d824366c..435491f5ef6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02ed70bb7b2644936959aee617296022dedb109e +refs/heads/master: 42b0aab1cc30b2fa7e0a99b832bd1b5c9b59757d diff --git a/trunk/drivers/mtd/onenand/onenand_base.c b/trunk/drivers/mtd/onenand/onenand_base.c index 26caf2590dae..f749935f3cb5 100644 --- a/trunk/drivers/mtd/onenand/onenand_base.c +++ b/trunk/drivers/mtd/onenand/onenand_base.c @@ -377,8 +377,11 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le default: block = onenand_block(this, addr); - page = (int) (addr - onenand_addr(this, block)) >> this->page_shift; - + if (FLEXONENAND(this)) + page = (int) (addr - onenand_addr(this, block))>>\ + this->page_shift; + else + page = (int) (addr >> this->page_shift); if (ONENAND_IS_2PLANE(this)) { /* Make the even block number */ block &= ~1;