diff options
| -rw-r--r-- | sys/dev/acpi_support/acpi_asus.c | 2 | ||||
| -rw-r--r-- | sys/dev/acpi_support/acpi_toshiba.c | 6 | ||||
| -rw-r--r-- | sys/i386/acpica/acpi_asus.c | 2 | ||||
| -rw-r--r-- | sys/i386/acpica/acpi_toshiba.c | 6 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c index f735196..f16121b 100644 --- a/sys/dev/acpi_support/acpi_asus.c +++ b/sys/dev/acpi_support/acpi_asus.c @@ -213,7 +213,7 @@ acpi_asus_probe(device_t dev) if (!acpi_disabled("asus") && acpi_get_type(dev) == ACPI_TYPE_DEVICE && - acpi_MatchHid(dev, "ATK0100")) { + acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) { sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); diff --git a/sys/dev/acpi_support/acpi_toshiba.c b/sys/dev/acpi_support/acpi_toshiba.c index 982868e..e3565be 100644 --- a/sys/dev/acpi_support/acpi_toshiba.c +++ b/sys/dev/acpi_support/acpi_toshiba.c @@ -212,13 +212,15 @@ TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys); static int acpi_toshiba_probe(device_t dev) { + ACPI_HANDLE h; int ret = ENXIO; + h = acpi_get_handle(dev); if (!acpi_disabled("toshiba") && acpi_get_type(dev) == ACPI_TYPE_DEVICE && device_get_unit(dev) == 0 && - (acpi_MatchHid(dev, "TOS6200") || - acpi_MatchHid(dev, "TOS6207"))) { + (acpi_MatchHid(h, "TOS6200") || + acpi_MatchHid(h, "TOS6207"))) { device_set_desc(dev, "Toshiba HCI Extras"); ret = 0; } diff --git a/sys/i386/acpica/acpi_asus.c b/sys/i386/acpica/acpi_asus.c index f735196..f16121b 100644 --- a/sys/i386/acpica/acpi_asus.c +++ b/sys/i386/acpica/acpi_asus.c @@ -213,7 +213,7 @@ acpi_asus_probe(device_t dev) if (!acpi_disabled("asus") && acpi_get_type(dev) == ACPI_TYPE_DEVICE && - acpi_MatchHid(dev, "ATK0100")) { + acpi_MatchHid(acpi_get_handle(dev), "ATK0100")) { sc = device_get_softc(dev); sc->dev = dev; sc->handle = acpi_get_handle(dev); diff --git a/sys/i386/acpica/acpi_toshiba.c b/sys/i386/acpica/acpi_toshiba.c index 982868e..e3565be 100644 --- a/sys/i386/acpica/acpi_toshiba.c +++ b/sys/i386/acpica/acpi_toshiba.c @@ -212,13 +212,15 @@ TUNABLE_INT("hw.acpi.toshiba.enable_fn_keys", &enable_fn_keys); static int acpi_toshiba_probe(device_t dev) { + ACPI_HANDLE h; int ret = ENXIO; + h = acpi_get_handle(dev); if (!acpi_disabled("toshiba") && acpi_get_type(dev) == ACPI_TYPE_DEVICE && device_get_unit(dev) == 0 && - (acpi_MatchHid(dev, "TOS6200") || - acpi_MatchHid(dev, "TOS6207"))) { + (acpi_MatchHid(h, "TOS6200") || + acpi_MatchHid(h, "TOS6207"))) { device_set_desc(dev, "Toshiba HCI Extras"); ret = 0; } |
