From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753386Ab2FRQTl (ORCPT ); Mon, 18 Jun 2012 12:19:41 -0400 Received: from a.ns.miles-group.at ([95.130.255.143]:47834 "EHLO radon.swed.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753225Ab2FRQTf (ORCPT ); Mon, 18 Jun 2012 12:19:35 -0400 From: Richard Weinberger To: linux-mtd@lists.infradead.org Cc: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, tglx@linutronix.de, tim.bird@am.sony.com, Marius.Mazarel@ugal.ro, artem.bityutskiy@linux.intel.com, Richard Weinberger Subject: [PATCH 09/22] UBI: Fastmap: Fix PEB count assert Date: Mon, 18 Jun 2012 18:18:52 +0200 Message-Id: <1340036345-96726-10-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1340036345-96726-1-git-send-email-richard@nod.at> References: <1340036345-96726-1-git-send-email-richard@nod.at> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use also the bad PEB count value, otherwise the assert will fail if the FLASH has bad blocks. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/wl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 4d9384b..58d74e4 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -1728,9 +1728,10 @@ 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->peb_count == found_pebs + ubi->fm->used_blocks); + ubi_assert(ubi->peb_count - ubi->bad_peb_count == \ + found_pebs + ubi->fm->used_blocks); else - ubi_assert(ubi->peb_count == found_pebs); + ubi_assert(ubi->peb_count - ubi->bad_peb_count == found_pebs); if (ubi->avail_pebs < WL_RESERVED_PEBS) { ubi_err("no enough physical eraseblocks (%d, need %d)", -- 1.7.6.5