Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24128
b: refs/heads/master
c: 225159b
h: refs/heads/master
v: v3
  • Loading branch information
Dave Peterson authored and Linus Torvalds committed Mar 26, 2006
1 parent 3995140 commit 9eb93a3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 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: 680cbbbb0e336b04b74be48b8ddd870537f1e226
refs/heads/master: 225159bd0a349bfd8cd9ae7c6bf39d75df09304a
8 changes: 2 additions & 6 deletions trunk/drivers/edac/amd76x_edac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
}

Expand Down

0 comments on commit 9eb93a3

Please sign in to comment.