Skip to content

Commit

Permalink
ACPICA: Disassembler: Remove duplicate code in _PLD processing.
Browse files Browse the repository at this point in the history
ACPICA commit 6d9c827b540837b6e54059e17756a06985e4a196

ACPICA BZ 1176.

Link: https://bugs.acpica.org/show_bug.cgi?id=1176
Link: https://github.com/acpica/acpica/commit/6d9c827b
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Aug 25, 2015
1 parent 4712f71 commit 3534969
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/acpi/acpica/utxface.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,8 @@ acpi_decode_pld_buffer(u8 *in_buffer,

/* Parameter validation */

if (!in_buffer || !return_buffer || (length < 16)) {
if (!in_buffer || !return_buffer
|| (length < ACPI_PLD_REV1_BUFFER_SIZE)) {
return (AE_BAD_PARAMETER);
}

Expand Down Expand Up @@ -567,7 +568,7 @@ acpi_decode_pld_buffer(u8 *in_buffer,
pld_info->rotation = ACPI_PLD_GET_ROTATION(&dword);
pld_info->order = ACPI_PLD_GET_ORDER(&dword);

if (length >= ACPI_PLD_BUFFER_SIZE) {
if (length >= ACPI_PLD_REV2_BUFFER_SIZE) {

/* Fifth 32-bit DWord (Revision 2 of _PLD) */

Expand Down
1 change: 1 addition & 0 deletions include/acpi/acbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ struct acpi_pld_info {
* (Intended for BIOS use only)
*/
#define ACPI_PLD_REV1_BUFFER_SIZE 16 /* For Revision 1 of the buffer (From ACPI spec) */
#define ACPI_PLD_REV2_BUFFER_SIZE 20 /* For Revision 2 of the buffer (From ACPI spec) */
#define ACPI_PLD_BUFFER_SIZE 20 /* For Revision 2 of the buffer (From ACPI spec) */

/* First 32-bit dword, bits 0:32 */
Expand Down

0 comments on commit 3534969

Please sign in to comment.