diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
| commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
| tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/exnames.c | |
| parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) | |
Patched in Tegra support.
Diffstat (limited to 'drivers/acpi/acpica/exnames.c')
| -rw-r--r-- | drivers/acpi/acpica/exnames.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/exnames.c b/drivers/acpi/acpica/exnames.c index 2ff578a16ad..49ec049c157 100644 --- a/drivers/acpi/acpica/exnames.c +++ b/drivers/acpi/acpica/exnames.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | |||
| 1 | /****************************************************************************** | 2 | /****************************************************************************** |
| 2 | * | 3 | * |
| 3 | * Module Name: exnames - interpreter/scanner name load/execute | 4 | * Module Name: exnames - interpreter/scanner name load/execute |
| @@ -5,7 +6,7 @@ | |||
| 5 | *****************************************************************************/ | 6 | *****************************************************************************/ |
| 6 | 7 | ||
| 7 | /* | 8 | /* |
| 8 | * Copyright (C) 2000 - 2012, Intel Corp. | 9 | * Copyright (C) 2000 - 2011, Intel Corp. |
| 9 | * All rights reserved. | 10 | * All rights reserved. |
| 10 | * | 11 | * |
| 11 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
| @@ -52,7 +53,8 @@ ACPI_MODULE_NAME("exnames") | |||
| 52 | /* Local prototypes */ | 53 | /* Local prototypes */ |
| 53 | static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs); | 54 | static char *acpi_ex_allocate_name_string(u32 prefix_count, u32 num_name_segs); |
| 54 | 55 | ||
| 55 | static acpi_status acpi_ex_name_segment(u8 **in_aml_address, char *name_string); | 56 | static acpi_status |
| 57 | acpi_ex_name_segment(u8 ** in_aml_address, char *name_string); | ||
| 56 | 58 | ||
| 57 | /******************************************************************************* | 59 | /******************************************************************************* |
| 58 | * | 60 | * |
| @@ -62,7 +64,7 @@ static acpi_status acpi_ex_name_segment(u8 **in_aml_address, char *name_string); | |||
| 62 | * (-1)==root, 0==none | 64 | * (-1)==root, 0==none |
| 63 | * num_name_segs - count of 4-character name segments | 65 | * num_name_segs - count of 4-character name segments |
| 64 | * | 66 | * |
| 65 | * RETURN: A pointer to the allocated string segment. This segment must | 67 | * RETURN: A pointer to the allocated string segment. This segment must |
| 66 | * be deleted by the caller. | 68 | * be deleted by the caller. |
| 67 | * | 69 | * |
| 68 | * DESCRIPTION: Allocate a buffer for a name string. Ensure allocated name | 70 | * DESCRIPTION: Allocate a buffer for a name string. Ensure allocated name |
| @@ -176,8 +178,7 @@ static acpi_status acpi_ex_name_segment(u8 ** in_aml_address, char *name_string) | |||
| 176 | 178 | ||
| 177 | ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n")); | 179 | ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "Bytes from stream:\n")); |
| 178 | 180 | ||
| 179 | for (index = 0; | 181 | for (index = 0; (index < ACPI_NAME_SIZE) |
| 180 | (index < ACPI_NAME_SIZE) | ||
| 181 | && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) { | 182 | && (acpi_ut_valid_acpi_char(*aml_address, 0)); index++) { |
| 182 | char_buf[index] = *aml_address++; | 183 | char_buf[index] = *aml_address++; |
| 183 | ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index])); | 184 | ACPI_DEBUG_PRINT((ACPI_DB_LOAD, "%c\n", char_buf[index])); |