From c27ac317e7749b0a8f5a48fd82c7a8eacf89be51 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Fri, 10 Aug 2007 14:01:30 -0700 Subject: [PATCH] --- yaml --- r: 68509 b: refs/heads/master c: f4e35647f5c0ac24ca1ba14f84bf817ec0483b72 h: refs/heads/master i: 68507: f245e88e765cba2d380baf1635bfbc52a6e01d86 v: v3 --- [refs] | 2 +- trunk/fs/jffs2/erase.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d170c8313cee..d4e25736be1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ed437c50d89eabae763dd422579f73fdebf288d +refs/heads/master: f4e35647f5c0ac24ca1ba14f84bf817ec0483b72 diff --git a/trunk/fs/jffs2/erase.c b/trunk/fs/jffs2/erase.c index efd83f33a806..addd3fc0e877 100644 --- a/trunk/fs/jffs2/erase.c +++ b/trunk/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;