From a532c7d747aba8eef56cda947f2427e122e793c1 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Fri, 20 Aug 2010 15:39:38 -0300 Subject: [PATCH] --- yaml --- r: 217387 b: refs/heads/master c: 88ef5ea9767b0c7bfb4b477e1857629fe8fa2983 h: refs/heads/master i: 217385: 1e37b103aa942b5db9bd1747faaba47bec9e3825 217383: cd59044cf3e4c91e4d750a18bbd38ba2b269d452 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 572d1aff9862..19a19ba4c790 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d37d240f2ff411c4d58bbbddefbda73a227d40c +refs/heads/master: 88ef5ea9767b0c7bfb4b477e1857629fe8fa2983 diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index 915835339d7c..d55f74a6cd49 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -2091,10 +2091,9 @@ static int __devinit i7core_probe(struct pci_dev *pdev, return 0; fail1: - list_for_each_entry(i7core_dev, &i7core_edac_list, list) { - if (i7core_dev->mci) - i7core_unregister_mci(i7core_dev); - } + list_for_each_entry(i7core_dev, &i7core_edac_list, list) + i7core_unregister_mci(i7core_dev); + i7core_put_all_devices(); fail0: mutex_unlock(&i7core_edac_lock); @@ -2126,10 +2125,8 @@ static void __devexit i7core_remove(struct pci_dev *pdev) return; } - list_for_each_entry(i7core_dev, &i7core_edac_list, list) { - if (i7core_dev->mci) - i7core_unregister_mci(i7core_dev); - } + list_for_each_entry(i7core_dev, &i7core_edac_list, list) + i7core_unregister_mci(i7core_dev); /* Release PCI resources */ i7core_put_all_devices();