aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/acpi_support
diff options
context:
space:
mode:
authorNate Lawson <njl@FreeBSD.org>2004-06-14 03:40:56 +0000
committerNate Lawson <njl@FreeBSD.org>2004-06-14 03:40:56 +0000
commit7a15653c9ca3e020e3894f665db341e328d0a2dc (patch)
tree6dee854e98406c4b8d28f7a50eb570f833690346 /sys/dev/acpi_support
parentb46dfa92b42cdc83f072321a8735b7f52708c33b (diff)
Notes
Diffstat (limited to 'sys/dev/acpi_support')
-rw-r--r--sys/dev/acpi_support/acpi_asus.c2
-rw-r--r--sys/dev/acpi_support/acpi_toshiba.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/acpi_support/acpi_asus.c b/sys/dev/acpi_support/acpi_asus.c
index f7351962d98dc..f16121b5c1dbe 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 982868e5e33f2..e3565be6ad2d4 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;
}