[JFFS2] fix printk warning in jffs2_block_check_erase()

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=f4e35647f5c0ac24ca1ba14f84bf817ec0483b72
Commit:     f4e35647f5c0ac24ca1ba14f84bf817ec0483b72
Parent:     9ed437c50d89eabae763dd422579f73fdebf288d
Author:     Andrew Morton <akpm at linux-foundation.org>
AuthorDate: Fri Aug 10 14:01:30 2007 -0700
Committer:  David Woodhouse <dwmw2 at infradead.org>
CommitDate: Wed Aug 22 12:41:48 2007 +0100

    [JFFS2] fix printk warning in jffs2_block_check_erase()
    
    fs/jffs2/erase.c: In function 'jffs2_block_check_erase':
    fs/jffs2/erase.c:355: warning: format '%08x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
    
    and
    
    fs/jffs2/erase.c: In function 'jffs2_erase_pending_blocks':
    fs/jffs2/erase.c:404: warning: 'bad_offset' may be used uninitialized in this function
    
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David Woodhouse <dwmw2 at infradead.org>
---
 fs/jffs2/erase.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
index efd83f3..addd3fc 100644
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -351,7 +351,7 @@ static int jffs2_block_check_erase(struct jffs2_sb_info *c, struct jffs2_erasebl
 		} while(--retlen);
 		c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size);
 		if (retlen)
-			printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08x\n",
+			printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08tx\n",
 			       *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf));
 		return 0;
 	}
@@ -401,7 +401,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
 {
 	size_t retlen;
 	int ret;
-	uint32_t bad_offset;
+	uint32_t uninitialized_var(bad_offset);
 
 	switch (jffs2_block_check_erase(c, jeb, &bad_offset)) {
 	case -EAGAIN:	goto refile;