diff options
author | Corey Minyard <cminyard@mvista.com> | 2015-04-10 21:19:18 -0400 |
---|---|---|
committer | Corey Minyard <cminyard@mvista.com> | 2015-05-05 15:24:46 -0400 |
commit | b1e65e71535aa128089d4cb1b6d90db7551fcb05 (patch) | |
tree | ee8a8e01b162ac016d4f138f57d1ddc23055d584 /drivers/char | |
parent | 5e33cd0c5a299772b5ec1a493f0a77548664ae06 (diff) |
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 468c75e10330..461274168d0f 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, | |||
2244 | acpi_handle handle; | 2244 | acpi_handle handle; |
2245 | acpi_status status; | 2245 | acpi_status status; |
2246 | unsigned long long tmp; | 2246 | unsigned long long tmp; |
2247 | int rv; | 2247 | int rv = -EINVAL; |
2248 | 2248 | ||
2249 | acpi_dev = pnp_acpi_device(dev); | 2249 | acpi_dev = pnp_acpi_device(dev); |
2250 | if (!acpi_dev) | 2250 | if (!acpi_dev) |
@@ -2276,6 +2276,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, | |||
2276 | info->si_type = SI_BT; | 2276 | info->si_type = SI_BT; |
2277 | break; | 2277 | break; |
2278 | case 4: /* SSIF, just ignore */ | 2278 | case 4: /* SSIF, just ignore */ |
2279 | rv = -ENODEV; | ||
2279 | goto err_free; | 2280 | goto err_free; |
2280 | default: | 2281 | default: |
2281 | dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); | 2282 | dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp); |
@@ -2336,7 +2337,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev, | |||
2336 | 2337 | ||
2337 | err_free: | 2338 | err_free: |
2338 | kfree(info); | 2339 | kfree(info); |
2339 | return -EINVAL; | 2340 | return rv; |
2340 | } | 2341 | } |
2341 | 2342 | ||
2342 | static void ipmi_pnp_remove(struct pnp_dev *dev) | 2343 | static void ipmi_pnp_remove(struct pnp_dev *dev) |