diff options
| author | Corey Minyard <cminyard@mvista.com> | 2015-04-10 20:19:18 -0500 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2015-05-05 14:24:46 -0500 |
| commit | b1e65e71535aa128089d4cb1b6d90db7551fcb05 (patch) | |
| tree | ee8a8e01b162ac016d4f138f57d1ddc23055d584 /drivers/char | |
| parent | 5e33cd0c5a299772b5ec1a493f0a77548664ae06 (diff) | |
| download | op-kernel-dev-b1e65e71535aa128089d4cb1b6d90db7551fcb05.zip op-kernel-dev-b1e65e71535aa128089d4cb1b6d90db7551fcb05.tar.gz | |
ipmi: Don't report err in the SI driver for SSIF devices
Really ignore them by returning -ENODEV from the probe, but not
doing anything.
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, 3 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 468c75e..4612741 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -2244,7 +2244,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, acpi_handle handle; acpi_status status; unsigned long long tmp; - int rv; + int rv = -EINVAL; acpi_dev = pnp_acpi_device(dev); if (!acpi_dev) @@ -2276,6 +2276,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, info->si_type = SI_BT; break; case 4: /* SSIF, just ignore */ + rv = -ENODEV; goto err_free; default: dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); @@ -2336,7 +2337,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, err_free: kfree(info); - return -EINVAL; + return rv; } static void ipmi_pnp_remove(struct pnp_dev *dev) |
