diff options
| author | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-01-17 23:56:43 +0000 |
| commit | 2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4 (patch) | |
| tree | a7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/contrib/dev/acpica/components/disassembler/dmresrc.c | |
| parent | 39b667a9d0968b8b54185d03b5b8bb2670346424 (diff) | |
| parent | 8f7c8be022add76a280165a4247448f1fcd77631 (diff) | |
| download | FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.zip FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.tar.gz | |
Merge ACPICA 20130117.
Diffstat (limited to 'sys/contrib/dev/acpica/components/disassembler/dmresrc.c')
| -rw-r--r-- | sys/contrib/dev/acpica/components/disassembler/dmresrc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/dev/acpica/components/disassembler/dmresrc.c b/sys/contrib/dev/acpica/components/disassembler/dmresrc.c index 5217084..8663a2a 100644 --- a/sys/contrib/dev/acpica/components/disassembler/dmresrc.c +++ b/sys/contrib/dev/acpica/components/disassembler/dmresrc.c @@ -5,7 +5,7 @@ ******************************************************************************/ /* - * Copyright (C) 2000 - 2012, Intel Corp. + * Copyright (C) 2000 - 2013, Intel Corp. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -415,7 +415,8 @@ AcpiDmIsResourceTemplate ( /* Walk the byte list, abort on any invalid descriptor type or length */ - Status = AcpiUtWalkAmlResources (WalkState, Aml, Length, NULL, &EndAml); + Status = AcpiUtWalkAmlResources (WalkState, Aml, Length, + NULL, (void **) &EndAml); if (ACPI_FAILURE (Status)) { return (AE_TYPE); |
