diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 10:46:18 +0100 |
commit | 9dacc71ff31a008d1e689fc824d31f6696454f68 (patch) | |
tree | b792f9c30008e1ed469a73ead4339fdf8a50a5ce /drivers/edac/i5000_edac.c | |
parent | 19f47c634ea8c5a10ff7bb1a08c52fd0f49bc54c (diff) | |
parent | 9bf1a2445f3c569098b8de7097ca324e65abecc2 (diff) |
Merge commit 'v2.6.28-rc5' into x86/cleanups
Diffstat (limited to 'drivers/edac/i5000_edac.c')
-rw-r--r-- | drivers/edac/i5000_edac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c index f0d9b415db5..d335086f4a2 100644 --- a/drivers/edac/i5000_edac.c +++ b/drivers/edac/i5000_edac.c @@ -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 */ @@ -1453,6 +1454,7 @@ fail1: i5000_put_devices(mci); fail0: + kobject_put(&mci->edac_mci_kobj); edac_mc_free(mci); return -ENODEV; } @@ -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); } |