From 87659da4513b49e1de7d0fd0132dc5205716eb00 Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 28 Apr 2010 17:46:47 +0200 Subject: [PATCH] --- yaml --- r: 195963 b: refs/heads/master c: 3328dc315914aa6db486da2ceb021b6f0b36b877 h: refs/heads/master i: 195961: 4c3c78f1dc706f0e1e5c045bbe9a2940ca173704 195959: 23d6dd30afcd222c42bceb9da334d6b4143221c2 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/onenand/onenand_base.c | 6 ++---- trunk/include/linux/mtd/onenand.h | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd0af78ebbf5..1d421752f18a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a8ce0b030716b95004a4ace969953bc3ad7d2fe +refs/heads/master: 3328dc315914aa6db486da2ceb021b6f0b36b877 diff --git a/trunk/drivers/mtd/onenand/onenand_base.c b/trunk/drivers/mtd/onenand/onenand_base.c index 045811f21497..9827ab779c08 100644 --- a/trunk/drivers/mtd/onenand/onenand_base.c +++ b/trunk/drivers/mtd/onenand/onenand_base.c @@ -1635,7 +1635,6 @@ static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr, size_t len) { struct onenand_chip *this = mtd->priv; - void __iomem *dataram; int ret = 0; int thislen, column; @@ -1655,10 +1654,9 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr, onenand_update_bufferram(mtd, addr, 1); - dataram = this->base + ONENAND_DATARAM; - dataram += onenand_bufferram_offset(mtd, ONENAND_DATARAM); + this->read_bufferram(mtd, ONENAND_DATARAM, this->verify_buf, 0, mtd->writesize); - if (memcmp(buf, dataram + column, thislen)) + if (memcmp(buf, this->verify_buf, thislen)) return -EBADMSG; len -= thislen; diff --git a/trunk/include/linux/mtd/onenand.h b/trunk/include/linux/mtd/onenand.h index 9b43268224a7..c26ff86ad08a 100644 --- a/trunk/include/linux/mtd/onenand.h +++ b/trunk/include/linux/mtd/onenand.h @@ -212,6 +212,8 @@ struct mtd_partition; struct onenand_platform_data { void (*mmcontrol)(struct mtd_info *mtd, int sync_read); + int (*read_bufferram)(struct mtd_info *mtd, int area, + unsigned char *buffer, int offset, size_t count); struct mtd_partition *parts; unsigned int nr_parts; };