aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/ipmi
diff options
context:
space:
mode:
authorCorey Minyard <minyard@acm.org>2007-05-12 13:36:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-12 13:55:40 -0400
commit8fe1425a60fdf6c51a41b95542416d7124587c34 (patch)
tree058493f5d89b005bec469e5b4103bcf825b543ca /drivers/char/ipmi
parentb6d1c9a44744224d83125a5a89c1a6cc4db27361 (diff)
IPMI: fix SI address space settings
Fix a rather obvious error that Patrick found in the setup routines. Need to set the proper address space in the ACPI case. Signed-off-by: Corey Minyard <minyard@acm.org> Cc: Patrick Schoeller <Patrick.Schoeller@hp.com> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/ipmi')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 6c5d15de3317..4769cc268806 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1915,10 +1915,10 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
1915 1915
1916 if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) { 1916 if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
1917 info->io_setup = mem_setup; 1917 info->io_setup = mem_setup;
1918 info->io.addr_type = IPMI_IO_ADDR_SPACE; 1918 info->io.addr_type = IPMI_MEM_ADDR_SPACE;
1919 } else if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_IO) { 1919 } else if (spmi->addr.space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
1920 info->io_setup = port_setup; 1920 info->io_setup = port_setup;
1921 info->io.addr_type = IPMI_MEM_ADDR_SPACE; 1921 info->io.addr_type = IPMI_IO_ADDR_SPACE;
1922 } else { 1922 } else {
1923 kfree(info); 1923 kfree(info);
1924 printk("ipmi_si: Unknown ACPI I/O Address type\n"); 1924 printk("ipmi_si: Unknown ACPI I/O Address type\n");