diff options
| author | Dinghao Liu <dinghao.liu@zju.edu.cn> | 2020-08-26 20:14:37 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-29 09:05:32 +0100 |
| commit | d463e4b902cb468bc49c6068397dfd53cb7b8cf1 (patch) | |
| tree | 2d5f49f785e8b6629a4ae0910dffa1ab605d9ca4 | |
| parent | f46af0e0896b23e896d0e80e510120bcb9e53ef6 (diff) | |
| download | linux-stable-d463e4b902cb468bc49c6068397dfd53cb7b8cf1.tar.gz linux-stable-d463e4b902cb468bc49c6068397dfd53cb7b8cf1.tar.bz2 linux-stable-d463e4b902cb468bc49c6068397dfd53cb7b8cf1.zip | |
EDAC/i5100: Fix error handling order in i5100_init_one()
[ Upstream commit 857a3139bd8be4f702c030c8ca06f3fd69c1741a ]
When pci_get_device_func() fails, the driver doesn't need to execute
pci_dev_put(). mci should still be freed, though, to prevent a memory
leak. When pci_enable_device() fails, the error injection PCI device
"einj" doesn't need to be disabled either.
[ bp: Massage commit message, rename label to "bail_mc_free". ]
Fixes: 52608ba205461 ("i5100_edac: probe for device 19 function 0")
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200826121437.31606-1-dinghao.liu@zju.edu.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/edac/i5100_edac.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c index c655162caf08..599038edd90d 100644 --- a/drivers/edac/i5100_edac.c +++ b/drivers/edac/i5100_edac.c @@ -1073,16 +1073,15 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id) PCI_DEVICE_ID_INTEL_5100_19, 0); if (!einj) { ret = -ENODEV; - goto bail_einj; + goto bail_mc_free; } rc = pci_enable_device(einj); if (rc < 0) { ret = rc; - goto bail_disable_einj; + goto bail_einj; } - mci->pdev = &pdev->dev; priv = mci->pvt_info; @@ -1149,14 +1148,14 @@ static int i5100_init_one(struct pci_dev *pdev, const struct pci_device_id *id) bail_scrub: priv->scrub_enable = 0; cancel_delayed_work_sync(&(priv->i5100_scrubbing)); - edac_mc_free(mci); - -bail_disable_einj: pci_disable_device(einj); bail_einj: pci_dev_put(einj); +bail_mc_free: + edac_mc_free(mci); + bail_disable_ch1: pci_disable_device(ch1mm); |