Skip to content

Commit

Permalink
ipmi: Don't report err in the SI driver for SSIF devices
Browse files Browse the repository at this point in the history
Really ignore them by returning -ENODEV from the probe, but not
doing anything.

Signed-off-by: Corey Minyard <[email protected]>
  • Loading branch information
cminyard committed May 5, 2015
1 parent 5e33cd0 commit b1e65e7
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/char/ipmi/ipmi_si_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit b1e65e7

Please sign in to comment.