commit | 900469d0b0c337db19908f77d172f4b17f4573ba | [log] [tgz] |
---|---|---|
author | José Adolfo Galdámez <josegalre@pac-rom.com> | Sat Jun 20 23:45:36 2015 -0600 |
committer | William Bellavance <flintman@flintmancomputers.com> | Wed Feb 10 20:02:51 2016 -0500 |
tree | e7c8e6e70ad09ecc74c7385269f9a7a908489b88 | |
parent | 3591a444f6b8cb82a9b88a49a4e67d8f4b61a6de [diff] |
Merge tag 'v3.4.108' into mm-6.0 Change-Id: I5ee718e5c87c9647c6edf0926a887679e065a649 Signed-off-by: José Adolfo Galdámez <josegalre@pac-rom.com>
diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c index f6a7d7a..b14ab43 100644 --- a/drivers/mtd/ubi/misc.c +++ b/drivers/mtd/ubi/misc.c
@@ -74,6 +74,8 @@ for (i = 0; i < vol->used_ebs; i++) { int size; + cond_resched(); + if (i == vol->used_ebs - 1) size = vol->last_eb_bytes; else