diff --git a/[refs] b/[refs]
index 37bf1b2c6064..e281052595a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 470b0a90d6a21cb72b671215f12ec7ec8a0db2c0
+refs/heads/master: 2c8cfdcbeb1ab0ec7bbd5af1be311b55281154c4
diff --git a/trunk/drivers/mtd/nand/cafe_ecc.c b/trunk/drivers/mtd/nand/cafe_ecc.c
index c4bec37e73eb..46214602d205 100644
--- a/trunk/drivers/mtd/nand/cafe_ecc.c
+++ b/trunk/drivers/mtd/nand/cafe_ecc.c
@@ -1045,7 +1045,6 @@ static unsigned short err_pos_lut[4096] = {
 static unsigned short err_pos(unsigned short din)
 {
 	BUG_ON(din > 4096);
-	BUG_ON(err_pos_lut[din] == 0xfff);
 	return err_pos_lut[din];
 }
 static int chk_no_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)