From 8b7bf112de826c3b25afaf658d7ee094fcdc8240 Mon Sep 17 00:00:00 2001 From: Hidetoshi Seto Date: Fri, 20 Aug 2010 04:32:05 -0300 Subject: [PATCH] --- yaml --- r: 217381 b: refs/heads/master c: 73589c80cd0dab94db50800c4834a8d8522cd54f h: refs/heads/master i: 217379: 3fb32e3cc1bef20a9e7a6248aa9f4e3a2d14eca3 v: v3 --- [refs] | 2 +- trunk/drivers/edac/i7core_edac.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ccb22bbc2b1c..a3df6c4428a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71fe01706d631513bdbd73381f4b76dacea5cf77 +refs/heads/master: 73589c80cd0dab94db50800c4834a8d8522cd54f diff --git a/trunk/drivers/edac/i7core_edac.c b/trunk/drivers/edac/i7core_edac.c index 472fa375f1eb..7ee5034100b9 100644 --- a/trunk/drivers/edac/i7core_edac.c +++ b/trunk/drivers/edac/i7core_edac.c @@ -2099,7 +2099,7 @@ static void __devexit i7core_remove(struct pci_dev *pdev) } list_for_each_entry(i7core_dev, &i7core_edac_list, list) { - mci = find_mci_by_dev(&i7core_dev->pdev[0]->dev); + mci = i7core_dev->mci; if (unlikely(!mci || !mci->pvt_info)) { debugf0("MC: " __FILE__ ": %s(): dev = %p\n", __func__, &i7core_dev->pdev[0]->dev); @@ -2108,7 +2108,6 @@ static void __devexit i7core_remove(struct pci_dev *pdev) "Couldn't find mci hanler\n"); } else { pvt = mci->pvt_info; - i7core_dev = pvt->i7core_dev; debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n", __func__, mci, &i7core_dev->pdev[0]->dev); @@ -2120,7 +2119,7 @@ static void __devexit i7core_remove(struct pci_dev *pdev) i7core_pci_ctl_release(pvt); /* Remove MC sysfs nodes */ - edac_mc_del_mc(&i7core_dev->pdev[0]->dev); + edac_mc_del_mc(mci->dev); debugf1("%s: free mci struct\n", mci->ctl_name); kfree(mci->ctl_name);