Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195963
b: refs/heads/master
c: 3328dc3
h: refs/heads/master
i:
  195961: 4c3c78f
  195959: 23d6dd3
v: v3
  • Loading branch information
Kyungmin Park authored and David Woodhouse committed May 14, 2010
1 parent e0c0782 commit 87659da
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a8ce0b030716b95004a4ace969953bc3ad7d2fe
refs/heads/master: 3328dc315914aa6db486da2ceb021b6f0b36b877
6 changes: 2 additions & 4 deletions trunk/drivers/mtd/onenand/onenand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions trunk/include/linux/mtd/onenand.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 87659da

Please sign in to comment.