KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: tplinkpart: allow to detect JFFS2 as well

Browse source 
SVN-Revision: 29543
This commit is contained in:
Gabor Juhos 2011-12-15 22:03:40 +00:00
parent b7d7481b07
commit 850be54b72
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
View file

@ -84,7 +84,7 @@ err:
return NULL; 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; u32 magic;
size_t retlen; size_t retlen;
@ -98,7 +98,8 @@ static int tplink_check_squashfs_magic(struct mtd_info *mtd, size_t offset)
if (retlen != sizeof(magic)) if (retlen != sizeof(magic))
return -EIO; return -EIO;
if (le32_to_cpu(magic) != SQUASHFS_MAGIC) if (le32_to_cpu(magic) != SQUASHFS_MAGIC &&
magic != 0x19852003)
return -EINVAL; return -EINVAL;
return 0; return 0;
@ -136,7 +137,7 @@ static int tplink_parse_partitions(struct mtd_info *master,
squashfs_offset = offset + sizeof(struct tplink_fw_header) + squashfs_offset = offset + sizeof(struct tplink_fw_header) +
be32_to_cpu(header->kernel_len); 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) if (ret == 0)
rootfs_offset = squashfs_offset; rootfs_offset = squashfs_offset;
else else