From 02ab21e8a7a60faf129ec325b85ccd75719fadf3 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Fri, 3 Feb 2012 11:03:28 +0200
Subject: [PATCH] --- yaml --- r: 298110 b: refs/heads/master c:
 79186876441278e7276d335448a4cb47fc4c1d8e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mtd/mtdconcat.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index d7a29f97a78a..2f8fdb91d96b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4cc625ea5958d065c21cc0fcea29e9ed8f3d2bc
+refs/heads/master: 79186876441278e7276d335448a4cb47fc4c1d8e
diff --git a/trunk/drivers/mtd/mtdconcat.c b/trunk/drivers/mtd/mtdconcat.c
index 5c7eb69c4ed9..d826a8a50e73 100644
--- a/trunk/drivers/mtd/mtdconcat.c
+++ b/trunk/drivers/mtd/mtdconcat.c
@@ -673,9 +673,6 @@ static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)
 	struct mtd_concat *concat = CONCAT(mtd);
 	int i, err = -EINVAL;
 
-	if (!mtd_can_have_bb(concat->subdev[0]))
-		return 0;
-
 	if (ofs > mtd->size)
 		return -EINVAL;