aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/char/ipmi/ipmi_si_platform.c6
-rw-r--r--drivers/char/ipmi/ipmi_ssif.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c
index 54c7ded2a1ff..f2a91c4d8cab 100644
--- a/drivers/char/ipmi/ipmi_si_platform.c
+++ b/drivers/char/ipmi/ipmi_si_platform.c
@@ -188,12 +188,10 @@ static int platform_ipmi_probe(struct platform_device *pdev)
188 return -EINVAL; 188 return -EINVAL;
189 189
190 rv = device_property_read_u8(&pdev->dev, "slave-addr", &slave_addr); 190 rv = device_property_read_u8(&pdev->dev, "slave-addr", &slave_addr);
191 if (rv) { 191 if (rv)
192 dev_warn(&pdev->dev, "device has no slave-addr property\n");
193 io.slave_addr = 0x20; 192 io.slave_addr = 0x20;
194 } else { 193 else
195 io.slave_addr = slave_addr; 194 io.slave_addr = slave_addr;
196 }
197 195
198 io.irq = platform_get_irq(pdev, 0); 196 io.irq = platform_get_irq(pdev, 0);
199 if (io.irq > 0) 197 if (io.irq > 0)
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c
index be329f791c95..cf8156d6bc07 100644
--- a/drivers/char/ipmi/ipmi_ssif.c
+++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -1995,7 +1995,7 @@ static int dmi_ipmi_probe(struct platform_device *pdev)
1995 1995
1996 rv = device_property_read_u8(&pdev->dev, "slave-addr", &slave_addr); 1996 rv = device_property_read_u8(&pdev->dev, "slave-addr", &slave_addr);
1997 if (rv) 1997 if (rv)
1998 dev_warn(&pdev->dev, "device has no slave-addr property"); 1998 slave_addr = 0x20;
1999 1999
2000 return new_ssif_client(i2c_addr, NULL, 0, 2000 return new_ssif_client(i2c_addr, NULL, 0,
2001 slave_addr, SI_SMBIOS, &pdev->dev); 2001 slave_addr, SI_SMBIOS, &pdev->dev);