---

yaml --- r: 347196 b: refs/heads/master c: ab0b00b h: refs/heads/master v: v3
git-mirror · Nov 22, 2012 · ef0056c · ef0056c
1 parent 254d417
commit ef0056c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b7ef60ce15c5f668c0da30a39ed9b315d3d7ff0
+refs/heads/master: ab0b00bc6ebcfbff42dedb3bf53f0ece79b27e88
diff --git a/trunk/drivers/mtd/ofpart.c b/trunk/drivers/mtd/ofpart.c
@@ -71,7 +71,10 @@ static int parse_ofpart_partitions(struct mtd_info *master,
 		(*pparts)[i].name = (char *)partname;
 
 		if (of_get_property(pp, "read-only", &len))
-			(*pparts)[i].mask_flags = MTD_WRITEABLE;
+			(*pparts)[i].mask_flags |= MTD_WRITEABLE;
+
+		if (of_get_property(pp, "lock", &len))
+			(*pparts)[i].mask_flags |= MTD_POWERUP_LOCK;
 
 		i++;
 	}