Merge remote-tracking branch 'asoc/fix/core' into tmp

[karo-tx-linux.git] / drivers / mtd / ofpart.c

diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index d9127e2ed808eab6ddfe5835c68cfa88ef490cf0..dbd3aa574eaf8462b9bce810ba9742c9c48f2eb2 100644 (file)
--- a/drivers/mtd/ofpart.c
+++ b/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++;
        }