Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208535
b: refs/heads/master
c: 7bb671e
h: refs/heads/master
i:
  208533: 4aa4cec
  208531: b296a70
  208527: a532cbd
v: v3
  • Loading branch information
Yinghai Lu authored and Linus Torvalds committed Aug 11, 2010
1 parent 5da8051 commit 572afed
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7faefea66a6d1f0d9da0a18615f57dc969e00d99
refs/heads/master: 7bb671e3d053226f870c333f701924986b39ee7f
12 changes: 11 additions & 1 deletion trunk/drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -2088,6 +2088,11 @@ static __devinit int try_init_spmi(struct SPMITable *spmi)
}
info->io.addr_data = spmi->addr.address;

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);

Expand Down Expand Up @@ -2366,6 +2371,11 @@ static __devinit void try_init_dmi(struct dmi_ipmi_data *ipmi_data)
if (info->irq)
info->irq_setup = std_irq_setup;

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);
}
Expand Down Expand Up @@ -3056,7 +3066,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;
}
Expand Down

0 comments on commit 572afed

Please sign in to comment.