aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/ipmi
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/ipmi')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 6c2daed531df..48330e0fd488 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2088,6 +2088,11 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
2088 } 2088 }
2089 info->io.addr_data = spmi->addr.address; 2089 info->io.addr_data = spmi->addr.address;
2090 2090
2091 pr_info("ipmi_si: SPMI: %s %#lx regsize %d spacing %d irq %d\n",
2092 (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
2093 info->io.addr_data, info->io.regsize, info->io.regspacing,
2094 info->irq);
2095
2091 if (add_smi(info)) 2096 if (add_smi(info))
2092 kfree(info); 2097 kfree(info);
2093 2098
@@ -2366,6 +2371,11 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
2366 if (info->irq) 2371 if (info->irq)
2367 info->irq_setup = std_irq_setup; 2372 info->irq_setup = std_irq_setup;
2368 2373
2374 pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n",
2375 (info->io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
2376 info->io.addr_data, info->io.regsize, info->io.regspacing,
2377 info->irq);
2378
2369 if (add_smi(info)) 2379 if (add_smi(info))
2370 kfree(info); 2380 kfree(info);
2371} 2381}
@@ -3056,7 +3066,7 @@ static int add_smi(struct smi_info *new_smi)
3056 si_to_str[new_smi->si_type]); 3066 si_to_str[new_smi->si_type]);
3057 mutex_lock(&smi_infos_lock); 3067 mutex_lock(&smi_infos_lock);
3058 if (!is_new_interface(new_smi)) { 3068 if (!is_new_interface(new_smi)) {
3059 printk(KERN_CONT PFX "duplicate interface\n"); 3069 printk(KERN_CONT " duplicate interface\n");
3060 rv = -EBUSY; 3070 rv = -EBUSY;
3061 goto out_err; 3071 goto out_err;
3062 } 3072 }