Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208533
b: refs/heads/master
c: f46c77c
h: refs/heads/master
i:
  208531: b296a70
v: v3
  • Loading branch information
Justin P. Mattock authored and Linus Torvalds committed Aug 11, 2010
1 parent 758ea5e commit 4aa4cec
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 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: cfbef3cb16658046c6faa8c9816018dd11ae62f0
refs/heads/master: f46c77c283e514a747aee7e8c4f5afc70274c232
10 changes: 2 additions & 8 deletions trunk/drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1965,8 +1965,8 @@ static int acpi_gpe_irq_setup(struct smi_info *info)

/*
* Defined at
* http://h21007.www2.hp.com/dspp/files/unprotected/devresource/
* Docs/TechPapers/IA64/hpspmi.pdf
* http://h21007.www2.hp.com/portal/download/files
* /unprot/hpspmi.pdf
*/
struct SPMITable {
s8 Signature[4];
Expand Down Expand Up @@ -2013,18 +2013,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");
Expand Down

0 comments on commit 4aa4cec

Please sign in to comment.