d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix locking broken by recent _CID changes. Always be sure to unlock

Browse Source 
in the error case.
This commit is contained in:
njl 2003-12-23 18:47:31 +00:00
parent 151da8eaf6
commit 8a8dfa84e9
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/dev/acpica/acpi.c
View File

@ -813,22 +813,25 @@ acpi_isa_get_logicalid(device_t dev)
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
pnpid = 0;
buf.Pointer = NULL;
buf.Length = ACPI_ALLOCATE_BUFFER;
ACPI_LOCK;
/* Fetch and validate the HID. */
if ((h = acpi_get_handle(dev)) == NULL)
return (0);
buf.Pointer = NULL;
buf.Length = ACPI_ALLOCATE_BUFFER;
goto out;
error = AcpiGetObjectInfo(h, &buf);
if (ACPI_FAILURE(error))
return (0);
goto out;
devinfo = (ACPI_DEVICE_INFO *)buf.Pointer;
if ((devinfo->Valid & ACPI_VALID_HID) != 0)
pnpid = PNP_EISAID(devinfo->HardwareId.Value);
AcpiOsFree(buf.Pointer);
out:
if (buf.Pointer != NULL)
AcpiOsFree(buf.Pointer);
ACPI_UNLOCK;
return_VALUE (pnpid);
}
@ -848,16 +851,17 @@ acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count)
pnpid = cids;
valid = 0;
buf.Pointer = NULL;
buf.Length = ACPI_ALLOCATE_BUFFER;
ACPI_LOCK;
/* Fetch and validate the CID */
if ((h = acpi_get_handle(dev)) == NULL)
return (0);
buf.Pointer = NULL;
buf.Length = ACPI_ALLOCATE_BUFFER;
goto out;
error = AcpiGetObjectInfo(h, &buf);
if (ACPI_FAILURE(error))
return (0);
goto out;
devinfo = (ACPI_DEVICE_INFO *)buf.Pointer;
if ((devinfo->Valid & ACPI_VALID_CID) == 0)
goto out;
@ -872,7 +876,8 @@ acpi_isa_get_compatid(device_t dev, uint32_t *cids, int count)
}
out:
AcpiOsFree(buf.Pointer);
if (buf.Pointer != NULL)
AcpiOsFree(buf.Pointer);
ACPI_UNLOCK;
return_VALUE (valid);
}