From 31fdffa9c3e8c1d0ca81fa811dadf137dab36f21 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 18 May 2012 15:51:02 +0300
Subject: [PATCH] --- yaml --- r: 319381 b: refs/heads/master c:
 08a4a136909602eae0e71e147153461df077a46f h: refs/heads/master i:   319379:
 a47506475002f2366b31410ec900ac99383e95ba v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/edac/edac_mc.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3a13a63a6c45..9ccd5d101633 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5156a5f4e058b906c1e8c0fe2ab16f30b60dee96
+refs/heads/master: 08a4a136909602eae0e71e147153461df077a46f
diff --git a/trunk/drivers/edac/edac_mc.c b/trunk/drivers/edac/edac_mc.c
index 98c759dc0d5d..91ca4101c789 100644
--- a/trunk/drivers/edac/edac_mc.c
+++ b/trunk/drivers/edac/edac_mc.c
@@ -355,6 +355,8 @@ struct mem_ctl_info *edac_mc_alloc(unsigned mc_num,
 		}
 
 		dimm = kzalloc(sizeof(**mci->dimms), GFP_KERNEL);
+		if (!dimm)
+			goto error;
 		mci->dimms[off] = dimm;
 		dimm->mci = mci;