diff options
| author | Corey Minyard <cminyard@mvista.com> | 2014-10-09 14:12:08 +0200 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2014-12-11 22:04:03 +0100 |
| commit | ab42bf24ee4f65e27f9f3ce6b5d65ec56568ca53 (patch) | |
| tree | b883c9aa2d3bdd09817668caa40739bda2f338ef /drivers/char | |
| parent | Merge branch 'topic/opal-ipmi' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-ab42bf24ee4f65e27f9f3ce6b5d65ec56568ca53.tar.xz linux-ab42bf24ee4f65e27f9f3ce6b5d65ec56568ca53.zip | |
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) case 3: /* BT */ info->si_type = SI_BT; break; + case 4: /* SSIF, just ignore */ + kfree(info); + return -EIO; default: printk(KERN_INFO PFX "Unknown ACPI/SPMI SI type %d\n", spmi->InterfaceType); @@ -2250,6 +2253,8 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, case 3: info->si_type = SI_BT; break; + case 4: /* SSIF, just ignore */ + goto err_free; default: dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); goto err_free; |