From 9eb93a3eb2f073e92b28220418712024bb9bdca7 Mon Sep 17 00:00:00 2001 From: Dave Peterson Date: Sun, 26 Mar 2006 01:38:41 -0800 Subject: [PATCH] --- yaml --- r: 24128 b: refs/heads/master c: 225159bd0a349bfd8cd9ae7c6bf39d75df09304a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/edac/amd76x_edac.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 55b6cb1bf451..ffb5260872a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 680cbbbb0e336b04b74be48b8ddd870537f1e226 +refs/heads/master: 225159bd0a349bfd8cd9ae7c6bf39d75df09304a diff --git a/trunk/drivers/edac/amd76x_edac.c b/trunk/drivers/edac/amd76x_edac.c index da171a56b636..6b7a441f0482 100644 --- a/trunk/drivers/edac/amd76x_edac.c +++ b/trunk/drivers/edac/amd76x_edac.c @@ -226,7 +226,7 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) debugf0("%s(): mci = %p\n", __func__, mci); - mci->pdev = pci_dev_get(pdev); + mci->pdev = pdev; mci->mtype_cap = MEM_FLAG_RDDR; mci->edac_ctl_cap = EDAC_FLAG_NONE | EDAC_FLAG_EC | EDAC_FLAG_SECDED; @@ -284,11 +284,8 @@ static int amd76x_probe1(struct pci_dev *pdev, int dev_idx) return 0; fail: - if (mci) { - if(mci->pdev) - pci_dev_put(mci->pdev); + if (mci != NULL) edac_mc_free(mci); - } return rc; } @@ -322,7 +319,6 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev) return; if (edac_mc_del_mc(mci)) return; - pci_dev_put(mci->pdev); edac_mc_free(mci); }