diff --git a/[refs] b/[refs] index 6a9cc5c51715..a8ff885d64bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26d9be11485ea8c1102c3e8eaa7667412eef4950 +refs/heads/master: eff3bba61fc19a64a1ca56343e38b6506bef9dea diff --git a/trunk/drivers/mtd/onenand/onenand_base.c b/trunk/drivers/mtd/onenand/onenand_base.c index d27f93b354e8..289ee3b1b030 100644 --- a/trunk/drivers/mtd/onenand/onenand_base.c +++ b/trunk/drivers/mtd/onenand/onenand_base.c @@ -2453,7 +2453,7 @@ static int onenand_block_by_block_erase(struct mtd_info *mtd, len -= block_size; addr += block_size; - if (addr == region_end) { + if (region && addr == region_end) { if (!len) break; region++;