Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / drivers / char / ipmi / ipmi_si_intf.c

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 2a84379..e537610 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -305,6 +305,9 @@ static int num_force_kipmid;
 #ifdef CONFIG_PCI
 static int pci_registered;
 #endif
+#ifdef CONFIG_ACPI
+static int pnp_registered;
+#endif
 #ifdef CONFIG_PPC_OF
 static int of_registered;
 #endif
@@ -1804,9 +1807,12 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                                info->irq_setup = std_irq_setup;
                        info->slave_addr = ipmb;
 
-                       if (!add_smi(info))
+                       if (!add_smi(info)) {
                                if (try_smi_init(info))
                                        cleanup_one_si(info);
+                       } else {
+                               kfree(info);
+                       }
                } else {
                        /* remove */
                        struct smi_info *e, *tmp_e;
@@ -1890,9 +1896,12 @@ static __devinit void hardcode_find_bmc(void)
                        info->irq_setup = std_irq_setup;
                info->slave_addr = slave_addrs[i];
 
-               if (!add_smi(info))
+               if (!add_smi(info)) {
                        if (try_smi_init(info))
                                cleanup_one_si(info);
+               } else {
+                       kfree(info);
+               }
        }
 }
 
@@ -2012,18 +2021,12 @@ struct SPMITable {
 static __devinit int try_init_spmi(struct SPMITable *spmi)
 {
        struct smi_info  *info;
-       u8               addr_space;
 
        if (spmi->IPMIlegacy != 1) {
                printk(KERN_INFO PFX "Bad SPMI legacy %d\n", spmi->IPMIlegacy);
                return -ENODEV;
        }
 
-       if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
-               addr_space = IPMI_MEM_ADDR_SPACE;
-       else
-               addr_space = IPMI_IO_ADDR_SPACE;
-
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info) {
                printk(KERN_ERR PFX "Could not allocate SI data (3)\n");
@@ -2087,7 +2090,13 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
        }
        info->io.addr_data = spmi->addr.address;
 
-       add_smi(info);
+       pr_info("ipmi_si: SPMI: %s %#lx regsize %d spacing %d irq %d\n",
+                (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
+                info->io.addr_data, info->io.regsize, info->io.regspacing,
+                info->irq);
+
+       if (add_smi(info))
+               kfree(info);
 
        return 0;
 }
@@ -2119,7 +2128,7 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
 {
        struct acpi_device *acpi_dev;
        struct smi_info *info;
-       struct resource *res;
+       struct resource *res, *res_second;
        acpi_handle handle;
        acpi_status status;
        unsigned long long tmp;
@@ -2175,13 +2184,13 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
        info->io.addr_data = res->start;
 
        info->io.regspacing = DEFAULT_REGSPACING;
-       res = pnp_get_resource(dev,
+       res_second = pnp_get_resource(dev,
                               (info->io.addr_type == IPMI_IO_ADDR_SPACE) ?
                                        IORESOURCE_IO : IORESOURCE_MEM,
                               1);
-       if (res) {
-               if (res->start > info->io.addr_data)
-                       info->io.regspacing = res->start - info->io.addr_data;
+       if (res_second) {
+               if (res_second->start > info->io.addr_data)
+                       info->io.regspacing = res_second->start - info->io.addr_data;
        }
        info->io.regsize = DEFAULT_REGSPACING;
        info->io.regshift = 0;
@@ -2203,7 +2212,10 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev,
                 res, info->io.regsize, info->io.regspacing,
                 info->irq);
 
-       return add_smi(info);
+       if (add_smi(info))
+               goto err_free;
+
+       return 0;
 
 err_free:
        kfree(info);
@@ -2361,7 +2373,13 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
        if (info->irq)
                info->irq_setup = std_irq_setup;
 
-       add_smi(info);
+       pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n",
+                (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
+                info->io.addr_data, info->io.regsize, info->io.regspacing,
+                info->irq);
+
+       if (add_smi(info))
+               kfree(info);
 }
 
 static void __devinit dmi_find_bmc(void)
@@ -2467,7 +2485,10 @@ static int __devinit ipmi_pci_probe(struct pci_dev *pdev,
                &pdev->resource[0], info->io.regsize, info->io.regspacing,
                info->irq);
 
-       return add_smi(info);
+       if (add_smi(info))
+               kfree(info);
+
+       return 0;
 }
 
 static void __devexit ipmi_pci_remove(struct pci_dev *pdev)
@@ -2509,7 +2530,7 @@ static struct pci_driver ipmi_pci_driver = {
 
 
 #ifdef CONFIG_PPC_OF
-static int __devinit ipmi_of_probe(struct of_device *dev,
+static int __devinit ipmi_of_probe(struct platform_device *dev,
                         const struct of_device_id *match)
 {
        struct smi_info *info;
@@ -2580,10 +2601,15 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
 
        dev_set_drvdata(&dev->dev, info);
 
-       return add_smi(info);
+       if (add_smi(info)) {
+               kfree(info);
+               return -EBUSY;
+       }
+
+       return 0;
 }
 
-static int __devexit ipmi_of_remove(struct of_device *dev)
+static int __devexit ipmi_of_remove(struct platform_device *dev)
 {
        cleanup_one_si(dev_get_drvdata(&dev->dev));
        return 0;
@@ -3013,6 +3039,8 @@ static __devinit void default_find_bmc(void)
                                info->io.addr_data);
                        } else
                                cleanup_one_si(info);
+               } else {
+                       kfree(info);
                }
        }
 }
@@ -3040,7 +3068,7 @@ static int add_smi(struct smi_info *new_smi)
                        si_to_str[new_smi->si_type]);
        mutex_lock(&smi_infos_lock);
        if (!is_new_interface(new_smi)) {
-               printk(KERN_CONT PFX "duplicate interface\n");
+               printk(KERN_CONT " duplicate interface\n");
                rv = -EBUSY;
                goto out_err;
        }
@@ -3333,6 +3361,7 @@ static __devinit int init_ipmi_si(void)
 
 #ifdef CONFIG_ACPI
        pnp_register_driver(&ipmi_pnp_driver);
+       pnp_registered = 1;
 #endif
 
 #ifdef CONFIG_DMI
@@ -3500,7 +3529,8 @@ static __exit void cleanup_ipmi_si(void)
                pci_unregister_driver(&ipmi_pci_driver);
 #endif
 #ifdef CONFIG_ACPI
-       pnp_unregister_driver(&ipmi_pnp_driver);
+       if (pnp_registered)
+               pnp_unregister_driver(&ipmi_pnp_driver);
 #endif
 
 #ifdef CONFIG_PPC_OF