ipmi: fix slave_addrs setting to actually work
authorBela Lubkin <blubkin@vmware.com>
Wed, 10 Mar 2010 23:23:07 +0000 (15:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Mar 2010 23:52:40 +0000 (15:52 -0800)
Actually use the slave_addrs module parameter if it is specified, and make
things consistent about passing zero in for the slave address for the
default.

Signed-off-by: Bela Lubkin <blubkin@vmware.com>
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/ipmi/ipmi_si_intf.c

index c234ada64565155f59d936c126053743586f08d6..4462b113ba3f1e134a1eb77b650af5e2732eb9af 100644 (file)
@@ -1201,7 +1201,7 @@ static int           regsizes[SI_MAX_PARMS];
 static unsigned int num_regsizes;
 static int           regshifts[SI_MAX_PARMS];
 static unsigned int num_regshifts;
-static int slave_addrs[SI_MAX_PARMS];
+static int slave_addrs[SI_MAX_PARMS]; /* Leaving 0 chooses the default value */
 static unsigned int num_slave_addrs;
 
 #define IPMI_IO_ADDR_SPACE  0
@@ -1669,7 +1669,7 @@ static int hotmod_handler(const char *val, struct kernel_param *kp)
                regsize = 1;
                regshift = 0;
                irq = 0;
-               ipmb = 0x20;
+               ipmb = 0; /* Choose the default if not specified */
 
                next = strchr(curr, ':');
                if (next) {
@@ -1861,6 +1861,7 @@ static __devinit void hardcode_find_bmc(void)
                info->irq = irqs[i];
                if (info->irq)
                        info->irq_setup = std_irq_setup;
+               info->slave_addr = slave_addrs[i];
 
                try_smi_init(info);
        }