From: Gabor Juhos <juhosg@openwrt.org>
Date: Thu, 15 Dec 2011 22:03:40 +0000 (+0000)
Subject: ar71xx: tplinkpart: allow to detect JFFS2 as well
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=850be54b72cc8129050c3b239d96359245db61a5;p=openwrt%2Fstaging%2Fthess.git

ar71xx: tplinkpart: allow to detect JFFS2 as well

SVN-Revision: 29543
---

diff --git a/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c b/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
index 2cbad5ada1..6f47f84351 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