Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43506
3c298f89-4303-0410-b956-
a3cf2f4a3e73
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1207,6 +1207,36 @@ static struct mtd_info * __init open_mtd
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
++ size_t len;
++ char magic[6];
++
++ /* 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);
++ put_mtd_device(mtd);
++ return;
++ }
++
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
static int __init ubi_init(void)
{
int err, i, k;
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1290,6 +1320,12 @@ static int __init ubi_init(void)
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd
+{
+ int err;
+ struct mtd_info *mtd;
+{
+ int err;
+ struct mtd_info *mtd;
+ /* try attaching mtd device named "ubi" or "data" */
+ mtd = open_mtd_device("ubi");
+ if (IS_ERR(mtd))
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
+ /* try attaching mtd device named "ubi" or "data" */
+ mtd = open_mtd_device("ubi");
+ if (IS_ERR(mtd))
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
++ size_t len;
++ char magic[6];
++
++ /* 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);
++ put_mtd_device(mtd);
++ return;
++ }
++
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
static int __init ubi_init(void)
{
int err, i, k;
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1298,6 +1328,12 @@ static int __init ubi_init(void)
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1209,6 +1209,36 @@ static struct mtd_info * __init open_mtd
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
+ mtd = open_mtd_device("data");
+
+ if (!IS_ERR(mtd)) {
++ size_t len;
++ char magic[6];
++
++ /* 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);
++ put_mtd_device(mtd);
++ return;
++ }
++
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
+ /* auto-add only media types where UBI makes sense */
+ if (mtd->type == MTD_NANDFLASH ||
+ mtd->type == MTD_DATAFLASH ||
static int __init ubi_init(void)
{
int err, i, k;
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1298,6 +1328,12 @@ static int __init ubi_init(void)