IPMI: Fix slave_addrs setting to actually work
PATCH 2/4 IPMI: Fix slave_addrs setting to actually work
From: Bela Lubkin <[email protected]>
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 <[email protected]>
Signed-off-by Corey Minyard <[email protected]>
---
drivers/char/ipmi/ipmi_si_intf.c +3 -2
@@ -1179,7 +1179,7 @@ static int regsizes[SI_MAX_PARstatic 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
@@ -1647,7 +1647,7 @@ static int hotmod_handler(const char *va regsize =1 ; regshift =0 ; irq =0 ; - ipmb =0x20 ; + ipmb =0 ;/* Choose the default if not specified */ next =strchr (curr,':' );if (next) {
@@ -1839,6 +1839,7 @@ static __devinit void hardcode_find_bmc( info->irq = irqs[i];if (info->irq) info->irq_setup = std_irq_setup; + info->slave_addr = slave_addrs[i];try_smi_init (info); }