|
|
|
@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> |
|
|
|
|
|
|
|
|
|
--- a/drivers/mtd/ubi/build.c
|
|
|
|
|
+++ b/drivers/mtd/ubi/build.c
|
|
|
|
|
@@ -1207,6 +1207,47 @@
|
|
|
|
|
@@ -1209,6 +1209,48 @@
|
|
|
|
|
return mtd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -23,6 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> |
|
|
|
|
+{
|
|
|
|
|
+ int err;
|
|
|
|
|
+ struct mtd_info *mtd;
|
|
|
|
|
+
|
|
|
|
|
+ /* try attaching mtd device named "ubi" or "data" */
|
|
|
|
|
+ mtd = open_mtd_device("ubi");
|
|
|
|
|
+ if (IS_ERR(mtd))
|
|
|
|
@ -30,12 +31,12 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> |
|
|
|
|
+
|
|
|
|
|
+ if (!IS_ERR(mtd)) {
|
|
|
|
|
+ size_t len;
|
|
|
|
|
+ char magic[6];
|
|
|
|
|
+ char magic[4];
|
|
|
|
|
+
|
|
|
|
|
+ /* check for a tar file magic */
|
|
|
|
|
+ err = mtd_read(mtd, 261, 6, &len, (void *) magic);
|
|
|
|
|
+ if (!err && len == 6 && !strncmp(magic, "ustar", 5)) {
|
|
|
|
|
+ ubi_err("cannot attach mtd%d as there is a valid tar magic", mtd->index);
|
|
|
|
|
+ /* check for a valid ubi magic */
|
|
|
|
|
+ err = mtd_read(mtd, 0, 4, &len, (void *) magic);
|
|
|
|
|
+ if (!err && len == 4 && strncmp(magic, "UBI#", 4)) {
|
|
|
|
|
+ ubi_err("no valid UBI magic found inside mtd%d", mtd->index);
|
|
|
|
|
+ put_mtd_device(mtd);
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
@ -59,7 +60,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org> |
|
|
|
|
static int __init ubi_init(void)
|
|
|
|
|
{
|
|
|
|
|
int err, i, k;
|
|
|
|
|
@@ -1290,6 +1331,12 @@
|
|
|
|
|
@@ -1298,6 +1340,12 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|