diff options
| author | Brian Norris | 2015-07-06 22:54:28 +0200 |
|---|---|---|
| committer | Brian Norris | 2015-07-06 22:54:28 +0200 |
| commit | 83dcf400be7165af938dbd6b8ce6805c754701db (patch) | |
| tree | 495ee9420e3e5478e91425a249be15504ba2dcd3 /drivers/mtd/ubi/wl.c | |
| parent | mtd: fsl-quadspi: Access multiple chips simultaneously (diff) | |
| parent | Linux 4.2-rc1 (diff) | |
| download | kernel-qcow2-linux-83dcf400be7165af938dbd6b8ce6805c754701db.tar.gz kernel-qcow2-linux-83dcf400be7165af938dbd6b8ce6805c754701db.tar.xz kernel-qcow2-linux-83dcf400be7165af938dbd6b8ce6805c754701db.zip | |
Merge 4.2-rc1 into MTD -next
Diffstat (limited to 'drivers/mtd/ubi/wl.c')
| -rw-r--r-- | drivers/mtd/ubi/wl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 16214d3d57a4..275d9fb6fe5c 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1581,7 +1581,7 @@ int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai) dbg_wl("found %i PEBs", found_pebs); if (ubi->fm) { - ubi_assert(ubi->good_peb_count == \ + ubi_assert(ubi->good_peb_count == found_pebs + ubi->fm->used_blocks); for (i = 0; i < ubi->fm->used_blocks; i++) { |