Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217362
b: refs/heads/master
c: 3cfd014
h: refs/heads/master
v: v3
  • Loading branch information
Mauro Carvalho Chehab committed Oct 24, 2010
1 parent bd67077 commit 45a09a2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9144601d364d5b81f3e63949337f8507eb58dca
refs/heads/master: 3cfd01468b98360ede8cc8849d14e586253d290c
11 changes: 9 additions & 2 deletions trunk/drivers/edac/i7core_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1889,7 +1889,8 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
if (unlikely(!mci))
return -ENOMEM;

debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);
debugf0("MC: " __FILE__ ": %s(): mci = %p, dev = %p\n",
__func__, mci, &i7core_dev->pdev[0]->dev);

/* record ptr to the generic device */
mci->dev = &i7core_dev->pdev[0]->dev;
Expand Down Expand Up @@ -2057,12 +2058,18 @@ static void __devexit i7core_remove(struct pci_dev *pdev)
list_for_each_entry_safe(i7core_dev, tmp, &i7core_edac_list, list) {
mci = find_mci_by_dev(&i7core_dev->pdev[0]->dev);
if (unlikely(!mci || !mci->pvt_info)) {
i7core_printk(KERN_ERR,
debugf0("MC: " __FILE__ ": %s(): dev = %p\n",
__func__, &i7core_dev->pdev[0]->dev);

i7core_printk(KERN_ERR,
"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);

if (likely(pvt->i7core_pci))
edac_pci_release_generic_ctl(pvt->i7core_pci);
else
Expand Down

0 comments on commit 45a09a2

Please sign in to comment.