diff options
| author | jkim <jkim@FreeBSD.org> | 2009-06-25 23:20:50 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2009-06-25 23:20:50 +0000 |
| commit | b0288ab5352e77c07fffaf51a4193f8de02a7aec (patch) | |
| tree | 90ff140546ac1c8f9223f343715887361e86492a /namespace/nsxfeval.c | |
| parent | 02935ea0ac5fb3dfc5e452b2a18288d7e523dc1b (diff) | |
| download | FreeBSD-src-b0288ab5352e77c07fffaf51a4193f8de02a7aec.zip FreeBSD-src-b0288ab5352e77c07fffaf51a4193f8de02a7aec.tar.gz | |
Import ACPICA 20090625
Diffstat (limited to 'namespace/nsxfeval.c')
| -rw-r--r-- | namespace/nsxfeval.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/namespace/nsxfeval.c b/namespace/nsxfeval.c index c0d8778..c2a5dbb 100644 --- a/namespace/nsxfeval.c +++ b/namespace/nsxfeval.c @@ -658,10 +658,11 @@ AcpiNsGetDeviceCallback ( ACPI_STATUS Status; ACPI_NAMESPACE_NODE *Node; UINT32 Flags; - ACPI_DEVICE_ID Hid; - ACPI_COMPATIBLE_ID_LIST *Cid; + ACPI_DEVICE_ID *Hid; + ACPI_DEVICE_ID_LIST *Cid; UINT32 i; BOOLEAN Found; + int Match; Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); @@ -715,7 +716,10 @@ AcpiNsGetDeviceCallback ( return (AE_CTRL_DEPTH); } - if (ACPI_STRNCMP (Hid.Value, Info->Hid, sizeof (Hid.Value)) != 0) + Match = ACPI_STRCMP (Hid->String, Info->Hid); + ACPI_FREE (Hid); + + if (!Match) { /* * HID does not match, attempt match within the @@ -736,8 +740,7 @@ AcpiNsGetDeviceCallback ( Found = FALSE; for (i = 0; i < Cid->Count; i++) { - if (ACPI_STRNCMP (Cid->Id[i].Value, Info->Hid, - sizeof (ACPI_COMPATIBLE_ID)) == 0) + if (ACPI_STRCMP (Cid->Ids[i].String, Info->Hid) == 0) { /* Found a matching CID */ |
