diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2007-08-10 17:01:30 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-22 07:41:48 -0400 |
commit | f4e35647f5c0ac24ca1ba14f84bf817ec0483b72 (patch) | |
tree | a379a91cbb060a1de6fcf0e78f4b256f0c7d12db /fs/jffs2 | |
parent | 9ed437c50d89eabae763dd422579f73fdebf288d (diff) |
[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@linux-foundation.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2')
-rw-r--r-- | 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 efd83f33a806..addd3fc0e877 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 | |||
351 | } while(--retlen); | 351 | } while(--retlen); |
352 | c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size); | 352 | c->mtd->unpoint(c->mtd, ebuf, jeb->offset, c->sector_size); |
353 | if (retlen) | 353 | if (retlen) |
354 | printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08x\n", | 354 | printk(KERN_WARNING "Newly-erased block contained word 0x%lx at offset 0x%08tx\n", |
355 | *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf)); | 355 | *wordebuf, jeb->offset + c->sector_size-retlen*sizeof(*wordebuf)); |
356 | return 0; | 356 | return 0; |
357 | } | 357 | } |
@@ -401,7 +401,7 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb | |||
401 | { | 401 | { |
402 | size_t retlen; | 402 | size_t retlen; |
403 | int ret; | 403 | int ret; |
404 | uint32_t bad_offset; | 404 | uint32_t uninitialized_var(bad_offset); |
405 | 405 | ||
406 | switch (jffs2_block_check_erase(c, jeb, &bad_offset)) { | 406 | switch (jffs2_block_check_erase(c, jeb, &bad_offset)) { |
407 | case -EAGAIN: goto refile; | 407 | case -EAGAIN: goto refile; |