From f529621a4dc284ae5c0e3ff247fe803e35adfff8 Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Tue, 18 May 2010 10:53:25 -0300
Subject: [PATCH] --- yaml --- r: 200085 b: refs/heads/master c:
 d4d1ef4515cca074d5bbe1c63420822d6b20fe63 h: refs/heads/master i:   200083:
 29a17feca5add0de25fd658a355a685fe1ee125a v: v3

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

diff --git a/[refs] b/[refs]
index 3c6ea750e09b..8e6ee83f8c00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac1ececea995fd77c8da6a1299674f22991cecaa
+refs/heads/master: d4d1ef4515cca074d5bbe1c63420822d6b20fe63
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
index 82acfbd01779..3e2b5379bc05 100644
--- a/trunk/drivers/edac/i7core_edac.c
+++ b/trunk/drivers/edac/i7core_edac.c
@@ -1856,7 +1856,8 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
 	}
 
 fail:
-	edac_mc_free(mci);
+	if (rc < 0)
+		edac_mc_free(mci);
 	return rc;
 }