diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-10-30 14:52:51 +0100 |
| commit | e573bdb324c78fac56655a493bea843842c9d9f8 (patch) | |
| tree | 3933d354a6be71cbe66d583fec3f5b2479e596ee /drivers/mtd/ubi/misc.c | |
| parent | a69fdc7787bfa2f27eed74c2ee58c28ce932d502 (diff) | |
| parent | 0eb4cf9c14315e1976a116de75da6f420ac0e8dd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/mtd/ubi/misc.c')
| -rw-r--r-- | drivers/mtd/ubi/misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c index 49530b7448f..504865b8e6e 100644 --- a/drivers/mtd/ubi/misc.c +++ b/drivers/mtd/ubi/misc.c @@ -63,6 +63,8 @@ int ubi_check_volume(struct ubi_device *ubi, int vol_id) for (i = 0; i < vol->used_ebs; i++) { int size; + cond_resched(); + if (i == vol->used_ebs - 1) size = vol->last_eb_bytes; else @@ -100,7 +102,7 @@ void ubi_update_reserved(struct ubi_device *ubi) ubi->avail_pebs -= need; ubi->rsvd_pebs += need; ubi->beb_rsvd_pebs += need; - ubi_msg("reserved more %d PEBs for bad PEB handling", need); + ubi_msg(ubi, "reserved more %d PEBs for bad PEB handling", need); } /** @@ -117,7 +119,7 @@ void ubi_calculate_reserved(struct ubi_device *ubi) ubi->beb_rsvd_level = ubi->bad_peb_limit - ubi->bad_peb_count; if (ubi->beb_rsvd_level < 0) { ubi->beb_rsvd_level = 0; - ubi_warn("number of bad PEBs (%d) is above the expected limit (%d), not reserving any PEBs for bad PEB handling, will use available PEBs (if any)", + ubi_warn(ubi, "number of bad PEBs (%d) is above the expected limit (%d), not reserving any PEBs for bad PEB handling, will use available PEBs (if any)", ubi->bad_peb_count, ubi->bad_peb_limit); } } |