diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-17 06:09:29 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 06:09:29 (GMT) |
| commit | 2bb4646fce8d09916b351d1a62f98db7cec6fc41 (patch) | |
| tree | c1f0d002e69868606eca9d1b919835f422892063 /drivers/mtd/tests/mtd_speedtest.c | |
| parent | 6836b9bdd98e3b500cd49512484df68f46e14659 (diff) | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| download | linux-fsl-qoriq-2bb4646fce8d09916b351d1a62f98db7cec6fc41.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/mtd/tests/mtd_speedtest.c')
| -rw-r--r-- | drivers/mtd/tests/mtd_speedtest.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c index 141363a..7fbb51d 100644 --- a/drivers/mtd/tests/mtd_speedtest.c +++ b/drivers/mtd/tests/mtd_speedtest.c @@ -301,6 +301,10 @@ static int scan_for_bad_eraseblocks(void) } memset(bbt, 0 , ebcnt); + /* NOR flash does not implement block_isbad */ + if (mtd->block_isbad == NULL) + goto out; + printk(PRINT_PREF "scanning for bad eraseblocks\n"); for (i = 0; i < ebcnt; ++i) { bbt[i] = is_block_bad(i) ? 1 : 0; @@ -309,6 +313,7 @@ static int scan_for_bad_eraseblocks(void) cond_resched(); } printk(PRINT_PREF "scanned %d eraseblocks, %d are bad\n", i, bad); +out: goodebcnt = ebcnt - bad; return 0; } @@ -340,7 +345,7 @@ static int __init mtd_speedtest_init(void) tmp = mtd->size; do_div(tmp, mtd->erasesize); ebcnt = tmp; - pgcnt = mtd->erasesize / mtd->writesize; + pgcnt = mtd->erasesize / pgsize; printk(PRINT_PREF "MTD device size %llu, eraseblock size %u, " "page size %u, count of eraseblocks %u, pages per " |