From 3f23a6b152c68ffe6888098bc9a6eaf9a336d6a6 Mon Sep 17 00:00:00 2001
From: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Date: Tue, 29 Nov 2011 12:49:18 +0200
Subject: [PATCH] --- yaml --- r: 282847 b: refs/heads/master c:
 556f063580db2953a7e53cd46b47724246320f60 h: refs/heads/master i:   282845:
 71a15491caf9234b6977fc69221c00a5a8667499   282843:
 6ca6415ef4e8f53b26fd15e9aea315100b3d4048   282839:
 7fd86db52f9271736c01a246c9d5105d9164d794   282831:
 af777ebcf1c801d6b743aaf04999ce0b75d14e68   282815:
 a7de91e611e2e386119d17eafe011d62a02e9476 v: v3

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

diff --git a/[refs] b/[refs]
index 8df208a93c9f..28b859825509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53466710202900ce49e471f480cac11275e1d0c4
+refs/heads/master: 556f063580db2953a7e53cd46b47724246320f60
diff --git a/trunk/drivers/mtd/mtdoops.c b/trunk/drivers/mtd/mtdoops.c
index cea9279ceabf..f3cdce9a85a6 100644
--- a/trunk/drivers/mtd/mtdoops.c
+++ b/trunk/drivers/mtd/mtdoops.c
@@ -372,7 +372,7 @@ static void mtdoops_notify_add(struct mtd_info *mtd)
 
 	/* oops_page_used is a bit field */
 	cxt->oops_page_used = vmalloc(DIV_ROUND_UP(mtdoops_pages,
-			BITS_PER_LONG));
+			BITS_PER_LONG) * sizeof(unsigned long));
 	if (!cxt->oops_page_used) {
 		printk(KERN_ERR "mtdoops: could not allocate page array\n");
 		return;