summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-12-15 22:03:40 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-12-15 22:03:40 +0000
commit850be54b72cc8129050c3b239d96359245db61a5 (patch)
tree62127effd5861f88029c1f0b71de7692fac1f055
parentb7d7481b078608d6187c5bf433ea3dccf9b394e7 (diff)
downloadmtk-20170518-850be54b72cc8129050c3b239d96359245db61a5.zip
mtk-20170518-850be54b72cc8129050c3b239d96359245db61a5.tar.gz
mtk-20170518-850be54b72cc8129050c3b239d96359245db61a5.tar.bz2
ar71xx: tplinkpart: allow to detect JFFS2 as well
SVN-Revision: 29543
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/tplinkpart.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c b/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
index 2cbad5a..6f47f84 100644
--- a/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
+++ b/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
@@ -84,7 +84,7 @@ err:
return NULL;
}
-static int tplink_check_squashfs_magic(struct mtd_info *mtd, size_t offset)
+static int tplink_check_rootfs_magic(struct mtd_info *mtd, size_t offset)
{
u32 magic;
size_t retlen;
@@ -98,7 +98,8 @@ static int tplink_check_squashfs_magic(struct mtd_info *mtd, size_t offset)
if (retlen != sizeof(magic))
return -EIO;
- if (le32_to_cpu(magic) != SQUASHFS_MAGIC)
+ if (le32_to_cpu(magic) != SQUASHFS_MAGIC &&
+ magic != 0x19852003)
return -EINVAL;
return 0;
@@ -136,7 +137,7 @@ static int tplink_parse_partitions(struct mtd_info *master,
squashfs_offset = offset + sizeof(struct tplink_fw_header) +
be32_to_cpu(header->kernel_len);
- ret = tplink_check_squashfs_magic(master, squashfs_offset);
+ ret = tplink_check_rootfs_magic(master, squashfs_offset);
if (ret == 0)
rootfs_offset = squashfs_offset;
else