From 7a4256678499bba775a7425f50fc2ad03c044b56 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Wed, 23 Apr 2008 09:39:49 +0100
Subject: [PATCH] --- yaml --- r: 93059 b: refs/heads/master c:
 986ee0139a91ab8b6b07d29d7a112c8033b5f8e0 h: refs/heads/master i:   93057:
 8381f8b2e47ec1a9e2908b72f32692918b8f42f6   93055:
 5b1daf47cd9d134cee8ee1ce35b5e2b9249d31c1 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/mtd/ar7part.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index bc2cd982cf4a..a2c0546b19f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe224668dff97dd8899bd559d1608cc9285db67b
+refs/heads/master: 986ee0139a91ab8b6b07d29d7a112c8033b5f8e0
diff --git a/trunk/drivers/mtd/ar7part.c b/trunk/drivers/mtd/ar7part.c
index 7722608d5a83..ecf170b55c32 100644
--- a/trunk/drivers/mtd/ar7part.c
+++ b/trunk/drivers/mtd/ar7part.c
@@ -34,6 +34,10 @@
 #define LOADER_MAGIC1	le32_to_cpu(0xfeedfa42)
 #define LOADER_MAGIC2	le32_to_cpu(0xfeed1281)
 
+#ifndef SQUASHFS_MAGIC
+#define SQUASHFS_MAGIC	0x73717368
+#endif
+
 struct ar7_bin_rec {
 	unsigned int checksum;
 	unsigned int length;
@@ -47,7 +51,8 @@ static int create_mtd_partitions(struct mtd_info *master,
 				 unsigned long origin)
 {
 	struct ar7_bin_rec header;
-	unsigned int offset, len;
+	unsigned int offset;
+	size_t len;
 	unsigned int pre_size = master->erasesize, post_size = 0;
 	unsigned int root_offset = ROOT_OFFSET;
 
@@ -66,7 +71,7 @@ static int create_mtd_partitions(struct mtd_info *master,
 	do { /* Try 10 blocks starting from master->erasesize */
 		offset = pre_size;
 		master->read(master, offset,
-			sizeof(header), &len, (u8 *)&header);
+			     sizeof(header), &len, (uint8_t *)&header);
 		if (!strncmp((char *)&header, "TIENV0.8", 8))
 			ar7_parts[1].offset = pre_size;
 		if (header.checksum == LOADER_MAGIC1)
@@ -88,7 +93,7 @@ static int create_mtd_partitions(struct mtd_info *master,
 		while (header.length) {
 			offset += sizeof(header) + header.length;
 			master->read(master, offset, sizeof(header),
-				     &len, (u8 *)&header);
+				     &len, (uint8_t *)&header);
 		}
 		root_offset = offset + sizeof(header) + 4;
 		break;
@@ -96,10 +101,10 @@ static int create_mtd_partitions(struct mtd_info *master,
 		while (header.length) {
 			offset += sizeof(header) + header.length;
 			master->read(master, offset, sizeof(header),
-				     &len, (u8 *)&header);
+				     &len, (uint8_t *)&header);
 		}
 		root_offset = offset + sizeof(header) + 4 + 0xff;
-		root_offset &= ~(u32)0xff;
+		root_offset &= ~(uint32_t)0xff;
 		break;
 	default:
 		printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum);