From 8524f318e9dd821645ba1323c4928dca108d174a Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Fri, 20 Aug 2010 04:29:47 -0300
Subject: [PATCH] --- yaml --- r: 217380 b: refs/heads/master c:
 71fe01706d631513bdbd73381f4b76dacea5cf77 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 396ef6878b35..ccb22bbc2b1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2896637b86243c39a4f08d15388dcc06130fff29
+refs/heads/master: 71fe01706d631513bdbd73381f4b76dacea5cf77
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
index 2e2db3c083ed..472fa375f1eb 100644
--- a/trunk/drivers/edac/i7core_edac.c
+++ b/trunk/drivers/edac/i7core_edac.c
@@ -2092,6 +2092,12 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
 	 */
 
 	mutex_lock(&i7core_edac_lock);
+
+	if (unlikely(!probed)) {
+		mutex_unlock(&i7core_edac_lock);
+		return;
+	}
+
 	list_for_each_entry(i7core_dev, &i7core_edac_list, list) {
 		mci = find_mci_by_dev(&i7core_dev->pdev[0]->dev);
 		if (unlikely(!mci || !mci->pvt_info)) {