diff options
author | Corey Minyard <cminyard@mvista.com> | 2014-10-09 08:12:08 -0400 |
---|---|---|
committer | Corey Minyard <cminyard@mvista.com> | 2014-12-11 16:04:03 -0500 |
commit | ab42bf24ee4f65e27f9f3ce6b5d65ec56568ca53 (patch) | |
tree | b883c9aa2d3bdd09817668caa40739bda2f338ef /drivers/char | |
parent | 5174f5ae6358b19123df11e86f6d6e47ea7330db (diff) |
ipmi: Ignore SSIF in the PNP handling
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 5c4e1f625bbb..87471198ee4c 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -2133,6 +2133,9 @@ static int try_init_spmi(struct SPMITable *spmi) | |||
2133 | case 3: /* BT */ | 2133 | case 3: /* BT */ |
2134 | info->si_type = SI_BT; | 2134 | info->si_type = SI_BT; |
2135 | break; | 2135 | break; |
2136 | case 4: /* SSIF, just ignore */ | ||
2137 | kfree(info); | ||
2138 | return -EIO; | ||
2136 | default: | 2139 | default: |
2137 | printk(KERN_INFO PFX "Unknown ACPI/SPMI SI type %d\n", | 2140 | printk(KERN_INFO PFX "Unknown ACPI/SPMI SI type %d\n", |
2138 | spmi->InterfaceType); | 2141 | spmi->InterfaceType); |
@@ -2250,6 +2253,8 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, | |||
2250 | case 3: | 2253 | case 3: |
2251 | info->si_type = SI_BT; | 2254 | info->si_type = SI_BT; |
2252 | break; | 2255 | break; |
2256 | case 4: /* SSIF, just ignore */ | ||
2257 | goto err_free; | ||
2253 | default: | 2258 | default: |
2254 | dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); | 2259 | dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); |
2255 | goto err_free; | 2260 | goto err_free; |