From 7689f6c9a1edfafe162c4c33160d0e061519e346 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 11 Aug 2010 23:40:15 -0300
Subject: [PATCH] --- yaml --- r: 217365 b: refs/heads/master c:
 39300e7143f8ef81b07cee3d8b86880bc4311ea0 h: refs/heads/master i:   217363:
 ca72d8469c380c8b93e4e610550b38a194560f4d v: v3

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

diff --git a/[refs] b/[refs]
index 33d92d8814e6..c7a5dcf30e40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41ba6c10586dfab632725cd532677ae5ae460e3e
+refs/heads/master: 39300e7143f8ef81b07cee3d8b86880bc4311ea0
diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c
index e5aa06e6389e..11c61b4d8149 100644
--- a/trunk/drivers/edac/i7core_edac.c
+++ b/trunk/drivers/edac/i7core_edac.c
@@ -1240,16 +1240,17 @@ static void i7core_put_devices(struct i7core_dev *i7core_dev)
 		pci_dev_put(pdev);
 	}
 	kfree(i7core_dev->pdev);
-	list_del(&i7core_dev->list);
-	kfree(i7core_dev);
 }
 
 static void i7core_put_all_devices(void)
 {
 	struct i7core_dev *i7core_dev, *tmp;
 
-	list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list)
+	list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) {
 		i7core_put_devices(i7core_dev);
+		list_del(&i7core_dev->list);
+		kfree(i7core_dev);
+	}
 }
 
 static void __init i7core_xeon_pci_fixup(const struct pci_id_table *table)
@@ -1438,7 +1439,6 @@ static int i7core_get_devices(const struct pci_id_table *table)
 	}
 
 	return 0;
-	return 0;
 }
 
 static int mci_bind_devs(struct mem_ctl_info *mci,
@@ -2092,6 +2092,8 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
 			/* Release PCI resources */
 			i7core_put_devices(i7core_dev);
 		}
+		list_del(&i7core_dev->list);
+		kfree(i7core_dev);
 	}
 	probed--;