e468c05d40
SVN-Revision: 15867
28 lines
747 B
Diff
28 lines
747 B
Diff
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -515,21 +515,21 @@ static int split_squashfs(struct mtd_inf
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (*((u32 *) buf) != SQUASHFS_MAGIC) {
|
|
+ if (SQUASHFS_MAGIC != le32_to_cpu(sb->s_magic) ) {
|
|
printk(KERN_ALERT "split_squashfs: no squashfs found in \"%s\"\n",
|
|
master->name);
|
|
*split_offset = 0;
|
|
return 0;
|
|
}
|
|
|
|
- if (sb->bytes_used <= 0) {
|
|
+ if (le64_to_cpu((sb->bytes_used)) <= 0) {
|
|
printk(KERN_ALERT "split_squashfs: squashfs is empty in \"%s\"\n",
|
|
master->name);
|
|
*split_offset = 0;
|
|
return 0;
|
|
}
|
|
|
|
- len = (u32) sb->bytes_used;
|
|
+ len = (u32) le64_to_cpu(sb->bytes_used);
|
|
len += (offset & 0x000fffff);
|
|
len += (master->erasesize - 1);
|
|
len &= ~(master->erasesize - 1);
|