From: Andrew Morton <akpm@osdl.org>

drivers/mtd/devices/block2mtd.c: In function `ustrtoul':
drivers/mtd/devices/block2mtd.c:372: warning: suggest explicit braces to avoid ambiguous `else'

Cc: Joern Engel <joern@wohnheim.fh-wedel.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/mtd/devices/block2mtd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/mtd/devices/block2mtd.c~mtd-improve-parameter-parsing-for-block2mtd-fix drivers/mtd/devices/block2mtd.c
--- devel/drivers/mtd/devices/block2mtd.c~mtd-improve-parameter-parsing-for-block2mtd-fix	2006-04-15 01:33:05.000000000 -0700
+++ devel-akpm/drivers/mtd/devices/block2mtd.c	2006-04-15 01:33:05.000000000 -0700
@@ -369,11 +369,12 @@ static int ustrtoul(const char *cp, char
 	case 'k':
 		result *= 1024;
 	/* By dwmw2 editorial decree, "ki", "Mi" or "Gi" are to be used. */
-		if ((*endp)[1] == 'i')
+		if ((*endp)[1] == 'i') {
 			if ((*endp)[2] == 'B')
 				(*endp) += 3;
 			else
 				(*endp) += 2;
+		}
 	}
 	return result;
 }
_