Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

i7core_edac: Fix error path of i7core_register_mci

Browse Source 
Release resources properly.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hidetoshi Seto 2010-08-20 04:28:40 -03:00 committed by Mauro Carvalho Chehab
parent 5939813b9c
commit 628c5ddfb0
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/edac/i7core_edac.c
View File

@ -1954,7 +1954,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
/* Store pci devices at mci for faster access */ /* Store pci devices at mci for faster access */
rc = mci_bind_devs(mci, i7core_dev); rc = mci_bind_devs(mci, i7core_dev);
if (unlikely(rc < 0)) if (unlikely(rc < 0))
goto fail; goto fail0;
if (pvt->is_registered) if (pvt->is_registered)
mci->mc_driver_sysfs_attributes = i7core_sysfs_rdimm_attrs; mci->mc_driver_sysfs_attributes = i7core_sysfs_rdimm_attrs;
@ -1977,7 +1977,7 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
*/ */
rc = -EINVAL; rc = -EINVAL;
goto fail; goto fail0;
} }
/* Default error mask is any memory */ /* Default error mask is any memory */
@ -1998,10 +1998,16 @@ static int i7core_register_mci(struct i7core_dev *i7core_dev,
if (unlikely(rc < 0)) { if (unlikely(rc < 0)) {
debugf0("MC: " __FILE__ debugf0("MC: " __FILE__
": %s(): failed edac_mce_register()\n", __func__); ": %s(): failed edac_mce_register()\n", __func__);
goto fail1;
} }
fail: return 0;
if (rc < 0)
fail1:
i7core_pci_ctl_release(pvt);
edac_mc_del_mc(mci->dev);
fail0:
kfree(mci->ctl_name);
edac_mc_free(mci); edac_mc_free(mci);
return rc; return rc;
} }