Skip to content

Commit b1e65e7

Browse files
committed
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>
1 parent 5e33cd0 commit b1e65e7

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/char/ipmi/ipmi_si_intf.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2244,7 +2244,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
22442244
acpi_handle handle;
22452245
acpi_status status;
22462246
unsigned long long tmp;
2247-
int rv;
2247+
int rv = -EINVAL;
22482248

22492249
acpi_dev = pnp_acpi_device(dev);
22502250
if (!acpi_dev)
@@ -2276,6 +2276,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
22762276
info->si_type = SI_BT;
22772277
break;
22782278
case 4: /* SSIF, just ignore */
2279+
rv = -ENODEV;
22792280
goto err_free;
22802281
default:
22812282
dev_info(&dev->dev, "unknown IPMI type %lld\n", tmp);
@@ -2336,7 +2337,7 @@ static int ipmi_pnp_probe(struct pnp_dev *dev,
23362337

23372338
err_free:
23382339
kfree(info);
2339-
return -EINVAL;
2340+
return rv;
23402341
}
23412342

23422343
static void ipmi_pnp_remove(struct pnp_dev *dev)

0 commit comments

Comments
 (0)