mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 05:34:00 +08:00
[PATCH] EDAC: i82875p cleanup
- Fix i82875p_probe1() so it calls pci_get_device() instead of pci_find_device(). - Fix i82875p_probe1() so it cleans up properly on failure. - Fix i82875p_init() so it cleans up properly on failure. Signed-off-by: David S. Peterson <dsp@llnl.gov> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
e8a491b401
commit
637beb697b
@ -289,7 +289,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
|
||||
debugf0("%s()\n", __func__);
|
||||
|
||||
ovrfl_pdev = pci_find_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
|
||||
ovrfl_pdev = pci_get_device(PCI_VEND_DEV(INTEL, 82875_6), NULL);
|
||||
|
||||
if (!ovrfl_pdev) {
|
||||
/*
|
||||
@ -302,26 +302,26 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
ovrfl_pdev =
|
||||
pci_scan_single_device(pdev->bus, PCI_DEVFN(6, 0));
|
||||
if (!ovrfl_pdev)
|
||||
goto fail;
|
||||
return -ENODEV;
|
||||
}
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (!ovrfl_pdev->procent && pci_proc_attach_device(ovrfl_pdev)) {
|
||||
i82875p_printk(KERN_ERR,
|
||||
"%s(): Failed to attach overflow device\n",
|
||||
__func__);
|
||||
goto fail;
|
||||
return -ENODEV;
|
||||
}
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
if (pci_enable_device(ovrfl_pdev)) {
|
||||
i82875p_printk(KERN_ERR,
|
||||
"%s(): Failed to enable overflow device\n",
|
||||
__func__);
|
||||
goto fail;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (pci_request_regions(ovrfl_pdev, pci_name(ovrfl_pdev))) {
|
||||
#ifdef CORRECT_BIOS
|
||||
goto fail;
|
||||
goto fail0;
|
||||
#endif
|
||||
}
|
||||
/* cache is irrelevant for PCI bus reads/writes */
|
||||
@ -331,7 +331,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
if (!ovrfl_window) {
|
||||
i82875p_printk(KERN_ERR, "%s(): Failed to ioremap bar6\n",
|
||||
__func__);
|
||||
goto fail;
|
||||
goto fail1;
|
||||
}
|
||||
|
||||
/* need to find out the number of channels */
|
||||
@ -345,7 +345,7 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
|
||||
if (!mci) {
|
||||
rc = -ENOMEM;
|
||||
goto fail;
|
||||
goto fail2;
|
||||
}
|
||||
|
||||
debugf3("%s(): init mci\n", __func__);
|
||||
@ -402,25 +402,26 @@ static int i82875p_probe1(struct pci_dev *pdev, int dev_idx)
|
||||
|
||||
if (edac_mc_add_mc(mci)) {
|
||||
debugf3("%s(): failed edac_mc_add_mc()\n", __func__);
|
||||
goto fail;
|
||||
goto fail3;
|
||||
}
|
||||
|
||||
/* get this far and it's successful */
|
||||
debugf3("%s(): success\n", __func__);
|
||||
return 0;
|
||||
|
||||
fail:
|
||||
if (mci)
|
||||
fail3:
|
||||
edac_mc_free(mci);
|
||||
|
||||
if (ovrfl_window)
|
||||
fail2:
|
||||
iounmap(ovrfl_window);
|
||||
|
||||
if (ovrfl_pdev) {
|
||||
fail1:
|
||||
pci_release_regions(ovrfl_pdev);
|
||||
pci_disable_device(ovrfl_pdev);
|
||||
}
|
||||
|
||||
#ifdef CORRECT_BIOS
|
||||
fail0:
|
||||
#endif
|
||||
pci_disable_device(ovrfl_pdev);
|
||||
/* NOTE: the ovrfl proc entry and pci_dev are intentionally left */
|
||||
return rc;
|
||||
}
|
||||
@ -497,24 +498,33 @@ static int __init i82875p_init(void)
|
||||
debugf3("%s()\n", __func__);
|
||||
pci_rc = pci_register_driver(&i82875p_driver);
|
||||
if (pci_rc < 0)
|
||||
return pci_rc;
|
||||
goto fail0;
|
||||
if (mci_pdev == NULL) {
|
||||
i82875p_registered = 0;
|
||||
mci_pdev =
|
||||
pci_get_device(PCI_VENDOR_ID_INTEL,
|
||||
PCI_DEVICE_ID_INTEL_82875_0, NULL);
|
||||
if (!mci_pdev) {
|
||||
debugf0("875p pci_get_device fail\n");
|
||||
return -ENODEV;
|
||||
pci_rc = -ENODEV;
|
||||
goto fail1;
|
||||
}
|
||||
pci_rc = i82875p_init_one(mci_pdev, i82875p_pci_tbl);
|
||||
if (pci_rc < 0) {
|
||||
debugf0("875p init fail\n");
|
||||
pci_dev_put(mci_pdev);
|
||||
return -ENODEV;
|
||||
pci_rc = -ENODEV;
|
||||
goto fail1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
||||
fail1:
|
||||
pci_unregister_driver(&i82875p_driver);
|
||||
|
||||
fail0:
|
||||
if (mci_pdev != NULL)
|
||||
pci_dev_put(mci_pdev);
|
||||
|
||||
return pci_rc;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user