mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
ipmi_si: Fix error handling of platform device
Cleanup of platform devices created by the IPMI driver was not being done correctly and could result in a memory leak. So create a local boolean to know how to clean up those platform devices. Reported-by: David Binderman <dcb314@hotmail.com> Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
parent
7195a5a6da
commit
174134ac76
1 changed files with 6 additions and 3 deletions
|
@ -2045,6 +2045,7 @@ static int try_smi_init(struct smi_info *new_smi)
|
||||||
int rv = 0;
|
int rv = 0;
|
||||||
int i;
|
int i;
|
||||||
char *init_name = NULL;
|
char *init_name = NULL;
|
||||||
|
bool platform_device_registered = false;
|
||||||
|
|
||||||
pr_info(PFX "Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n",
|
pr_info(PFX "Trying %s-specified %s state machine at %s address 0x%lx, slave address 0x%x, irq %d\n",
|
||||||
ipmi_addr_src_to_str(new_smi->io.addr_source),
|
ipmi_addr_src_to_str(new_smi->io.addr_source),
|
||||||
|
@ -2173,6 +2174,7 @@ static int try_smi_init(struct smi_info *new_smi)
|
||||||
rv);
|
rv);
|
||||||
goto out_err;
|
goto out_err;
|
||||||
}
|
}
|
||||||
|
platform_device_registered = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev_set_drvdata(new_smi->io.dev, new_smi);
|
dev_set_drvdata(new_smi->io.dev, new_smi);
|
||||||
|
@ -2279,10 +2281,11 @@ static int try_smi_init(struct smi_info *new_smi)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (new_smi->pdev) {
|
if (new_smi->pdev) {
|
||||||
platform_device_unregister(new_smi->pdev);
|
if (platform_device_registered)
|
||||||
|
platform_device_unregister(new_smi->pdev);
|
||||||
|
else
|
||||||
|
platform_device_put(new_smi->pdev);
|
||||||
new_smi->pdev = NULL;
|
new_smi->pdev = NULL;
|
||||||
} else if (new_smi->pdev) {
|
|
||||||
platform_device_put(new_smi->pdev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
kfree(init_name);
|
kfree(init_name);
|
||||||
|
|
Loading…
Reference in a new issue