OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5174f5a
)
ipmi: Ignore SSIF in the PNP handling
author
Corey Minyard
<cminyard@mvista.com>
Thu, 9 Oct 2014 12:12:08 +0000
(07:12 -0500)
committer
Corey Minyard
<cminyard@mvista.com>
Thu, 11 Dec 2014 21:04:03 +0000
(15:04 -0600)
Signed-off-by: Corey Minyard <cminyard@mvista.com>
drivers/char/ipmi/ipmi_si_intf.c
patch
|
blob
|
history
diff --git
a/drivers/char/ipmi/ipmi_si_intf.c
b/drivers/char/ipmi/ipmi_si_intf.c
index
5c4e1f6
..
8747119
100644
(file)
--- 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;