diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
commit | 9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (patch) | |
tree | 529b4a220e337e6450d810b88c49c08c32f65ed6 /drivers/mtd/mtdraw.c | |
parent | 856f60dbd157126241cf9033514137849bb5ca22 (diff) | |
parent | 4104dd917388943f5b0ae87d1360738675c338b0 (diff) | |
download | barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.gz barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.xz |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/at91sam9x5ek_defconfig
Diffstat (limited to 'drivers/mtd/mtdraw.c')
-rw-r--r-- | drivers/mtd/mtdraw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c index 079575c326..ec7769249b 100644 --- a/drivers/mtd/mtdraw.c +++ b/drivers/mtd/mtdraw.c @@ -241,7 +241,7 @@ static int mtdraw_erase(struct cdev *cdev, size_t count, loff_t _offset) while (count > 0) { debug("erase %d %d\n", erase.addr, erase.len); - ret = mtd->block_isbad(mtd, erase.addr); + ret = mtd_block_isbad(mtd, erase.addr); if (ret > 0) { printf("Skipping bad block at 0x%08x\n", erase.addr); } else { |