UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipmi: Cleanup error return 

Return proper errors for a lot of IPMI failure cases.  Also call
pci_disable_device when IPMI PCI devices are removed.

Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Corey Minyard 2014-01-24 14:00:53 -06:00 committed by Linus Torvalds
parent e21404dc0a
commit d02b3709ff
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -1849,11 +1849,15 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
info->irq_setup = std_irq_setup; info->irq_setup = std_irq_setup;
info->slave_addr = ipmb; info->slave_addr = ipmb;
if (!add_smi(info)) { rv = add_smi(info);
if (try_smi_init(info)) if (rv) {
cleanup_one_si(info);
} else {
kfree(info); kfree(info);
goto out;
}
rv = try_smi_init(info);
if (rv) {
cleanup_one_si(info);
goto out;
} }
} else { } else {
/* remove */ /* remove */
@ -2067,6 +2071,7 @@ struct SPMITable {
static int try_init_spmi(struct SPMITable *spmi) static int try_init_spmi(struct SPMITable *spmi)
{ {
struct smi_info *info; struct smi_info *info;
int rv;
if (spmi->IPMIlegacy != 1) { if (spmi->IPMIlegacy != 1) {
printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy); printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
@ -2141,10 +2146,11 @@ static int try_init_spmi(struct SPMITable *spmi)
info->io.addr_data, info->io.regsize, info->io.regspacing, info->io.addr_data, info->io.regsize, info->io.regspacing,
info->irq); info->irq);
if (add_smi(info)) rv = add_smi(info);
if (rv)
kfree(info); kfree(info);
return 0; return rv;
} }
static void spmi_find_bmc(void) static void spmi_find_bmc(void)
@ -2178,6 +2184,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
acpi_handle handle; acpi_handle handle;
acpi_status status; acpi_status status;
unsigned long long tmp; unsigned long long tmp;
int rv;
acpi_dev = pnp_acpi_device(dev); acpi_dev = pnp_acpi_device(dev);
if (!acpi_dev) if (!acpi_dev)
@ -2259,10 +2266,11 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
res, info->io.regsize, info->io.regspacing, res, info->io.regsize, info->io.regspacing,
info->irq); info->irq);
if (add_smi(info)) rv = add_smi(info);
goto err_free; if (rv)
kfree(info);
return 0; return rv;
err_free: err_free:
kfree(info); kfree(info);
@ -2566,16 +2574,20 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
&pdev->resource[0], info->io.regsize, info->io.regspacing, &pdev->resource[0], info->io.regsize, info->io.regspacing,
info->irq); info->irq);
if (add_smi(info)) rv = add_smi(info);
if (rv) {
kfree(info); kfree(info);
pci_disable_device(pdev);
}
return 0; return rv;
} }
static void ipmi_pci_remove(struct pci_dev *pdev) static void ipmi_pci_remove(struct pci_dev *pdev)
{ {
struct smi_info *info = pci_get_drvdata(pdev); struct smi_info *info = pci_get_drvdata(pdev);
cleanup_one_si(info); cleanup_one_si(info);
pci_disable_device(pdev);
} }
static struct pci_device_id ipmi_pci_devices[] = { static struct pci_device_id ipmi_pci_devices[] = {
@ -2670,9 +2682,10 @@ static int ipmi_probe(struct platform_device *dev)
dev_set_drvdata(&dev->dev, info); dev_set_drvdata(&dev->dev, info);
if (add_smi(info)) { ret = add_smi(info);
if (ret) {
kfree(info); kfree(info);
return -EBUSY; return ret;
} }
#endif #endif
return 0; return 0;
@ -2736,9 +2749,10 @@ static int ipmi_parisc_probe(struct parisc_device *dev)
dev_set_drvdata(&dev->dev, info); dev_set_drvdata(&dev->dev, info);
if (add_smi(info)) { rv = add_smi(info);
if (rv) {
kfree(info); kfree(info);
return -EBUSY; return rv;
} }
return 0; return 0;