---

yaml --- r: 329074 b: refs/heads/master c: abb3e01 h: refs/heads/master v: v3
git-mirror · Sep 4, 2012 · 80979cb · 80979cb
1 parent 58d9dc0
commit 80979cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db7e21c21f293d52f5363fe8d9ee91d6bd0a503a
+refs/heads/master: abb3e01103eb4e2ea5c15e6fedbc74e08bd4cc2b
diff --git a/trunk/drivers/mtd/ubi/build.c b/trunk/drivers/mtd/ubi/build.c
@@ -799,6 +799,11 @@ static int autoresize(struct ubi_device *ubi, int vol_id)
 	struct ubi_volume *vol = ubi->volumes[vol_id];
 	int err, old_reserved_pebs = vol->reserved_pebs;
 
+	if (ubi->ro_mode) {
+		ubi_warn("skip auto-resize because of R/O mode");
+		return 0;
+	}
+
 	/*
 	 * Clear the auto-resize flag in the volume in-memory copy of the
 	 * volume table, and 'ubi_resize_volume()' will propagate this change