Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118902
b: refs/heads/master
c: f0f7e0d
h: refs/heads/master
v: v3
  • Loading branch information
Darrick J. Wong authored and Linus Torvalds committed Nov 13, 2008
1 parent 95478e4 commit 625d5af
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: fe2d5ffc74a1de6a31e9fd65b65cce72d881edf7
refs/heads/master: f0f7e0dc7393268947dc3ed285defc3d375487b9
4 changes: 3 additions & 1 deletion trunk/drivers/edac/i5000_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
if (mci == NULL)
return -ENOMEM;

kobject_get(&mci->edac_mci_kobj);
debugf0("MC: " __FILE__ ": %s(): mci = %p\n", __func__, mci);

mci->dev = &pdev->dev; /* record ptr to the generic device */
Expand Down Expand Up @@ -1453,6 +1454,7 @@ static int i5000_probe1(struct pci_dev *pdev, int dev_idx)
i5000_put_devices(mci);

fail0:
kobject_put(&mci->edac_mci_kobj);
edac_mc_free(mci);
return -ENODEV;
}
Expand Down Expand Up @@ -1498,7 +1500,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)

/* retrieve references to resources, and free those resources */
i5000_put_devices(mci);

kobject_put(&mci->edac_mci_kobj);
edac_mc_free(mci);
}

Expand Down

0 comments on commit 625d5af

Please sign in to comment.