]> err.no Git - linux-2.6/blobdiff - drivers/char/ipmi/ipmi_si_intf.c
Merge branch 'linus' into x86/gart
[linux-2.6] / drivers / char / ipmi / ipmi_si_intf.c
index 5a5455585c1d278bd770a784fd5e1df603df85e3..192688344ed2d628bc789fa85d9ba4cafcadf867 100644 (file)
@@ -2352,10 +2352,16 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
 
        info->si_type           = (enum si_type) match->data;
        info->addr_source       = "device-tree";
-       info->io_setup          = mem_setup;
        info->irq_setup         = std_irq_setup;
 
-       info->io.addr_type      = IPMI_MEM_ADDR_SPACE;
+       if (resource.flags & IORESOURCE_IO) {
+               info->io_setup          = port_setup;
+               info->io.addr_type      = IPMI_IO_ADDR_SPACE;
+       } else {
+               info->io_setup          = mem_setup;
+               info->io.addr_type      = IPMI_MEM_ADDR_SPACE;
+       }
+
        info->io.addr_data      = resource.start;
 
        info->io.regsize        = regsize ? *regsize : DEFAULT_REGSIZE;