From 2d3b52d7356338a309444923cdff434ac7fa6339 Mon Sep 17 00:00:00 2001
From: Matthieu CASTET <matthieu.castet@parrot.com>
Date: Wed, 22 Aug 2012 16:03:46 +0200
Subject: [PATCH] --- yaml --- r: 329075 b: refs/heads/master c:
 193819cf2e6e395b1e1be2d36785dc5563a6edca h: refs/heads/master i:   329073:
 58d9dc09a81673a1c06af9b77b7b706b4a00c4ae   329071:
 f17b2991b311b6e4c93e76a35873a0bcc6a4ef63 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mtd/ubi/attach.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d22dc7af90ba..343640aea9df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abb3e01103eb4e2ea5c15e6fedbc74e08bd4cc2b
+refs/heads/master: 193819cf2e6e395b1e1be2d36785dc5563a6edca
diff --git a/trunk/drivers/mtd/ubi/attach.c b/trunk/drivers/mtd/ubi/attach.c
index bd27cbbb4066..68d4d1f76d1e 100644
--- a/trunk/drivers/mtd/ubi/attach.c
+++ b/trunk/drivers/mtd/ubi/attach.c
@@ -975,7 +975,7 @@ static int scan_peb(struct ubi_device *ubi, struct ubi_attach_info *ai,
 			return err;
 		goto adjust_mean_ec;
 	case UBI_IO_FF:
-		if (ec_err)
+		if (ec_err || bitflips)
 			err = add_to_list(ai, pnum, UBI_UNKNOWN,
 					  UBI_UNKNOWN, ec, 1, &ai->erase);
 		else