summaryrefslogtreecommitdiff
path: root/sys/dev/acpica/acpi_smbat.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/acpica/acpi_smbat.c')
-rw-r--r--sys/dev/acpica/acpi_smbat.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c
index af09f383b8435..718dc9f49f8fe 100644
--- a/sys/dev/acpica/acpi_smbat.c
+++ b/sys/dev/acpica/acpi_smbat.c
@@ -107,16 +107,18 @@ acpi_smbat_probe(device_t dev)
{
static char *smbat_ids[] = {"ACPI0001", "ACPI0005", NULL};
ACPI_STATUS status;
+ int rv;
- if (acpi_disabled("smbat") ||
- ACPI_ID_PROBE(device_get_parent(dev), dev, smbat_ids) == NULL)
+ if (acpi_disabled("smbat"))
return (ENXIO);
+ rv = ACPI_ID_PROBE(device_get_parent(dev), dev, smbat_ids, NULL);
+ if (rv > 0)
+ return (rv);
status = AcpiEvaluateObject(acpi_get_handle(dev), "_EC", NULL, NULL);
if (ACPI_FAILURE(status))
return (ENXIO);
-
device_set_desc(dev, "ACPI Smart Battery");
- return (0);
+ return (rv);
}
static int