diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-10 11:52:05 +0000 |
| commit | fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4 (patch) | |
| tree | c5b460cfc60b16a7c6718ae2613bb1d9cb98e5b8 /drivers/acpi/acpica/rscalc.c | |
| parent | 56d37d85438df38e150282baafe52dcd588854c7 (diff) | |
| parent | 374b105797c3d4f29c685f3be535c35f5689b30e (diff) | |
| download | talos-obmc-linux-fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4.tar.gz talos-obmc-linux-fce6bd84d663b92997e0fa9c971ed2b2cdf08fb4.zip | |
Merge tag 'v3.13-rc3' into asoc-arizona
Linux 3.13-rc3
Diffstat (limited to 'drivers/acpi/acpica/rscalc.c')
| -rw-r--r-- | drivers/acpi/acpica/rscalc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c index b62a0f4f4f9b..b60c9cf82862 100644 --- a/drivers/acpi/acpica/rscalc.c +++ b/drivers/acpi/acpica/rscalc.c @@ -174,6 +174,7 @@ acpi_rs_stream_option_length(u32 resource_length, * FUNCTION: acpi_rs_get_aml_length * * PARAMETERS: resource - Pointer to the resource linked list + * resource_list_size - Size of the resource linked list * size_needed - Where the required size is returned * * RETURN: Status @@ -185,16 +186,20 @@ acpi_rs_stream_option_length(u32 resource_length, ******************************************************************************/ acpi_status -acpi_rs_get_aml_length(struct acpi_resource * resource, acpi_size * size_needed) +acpi_rs_get_aml_length(struct acpi_resource *resource, + acpi_size resource_list_size, acpi_size * size_needed) { acpi_size aml_size_needed = 0; + struct acpi_resource *resource_end; acpi_rs_length total_size; ACPI_FUNCTION_TRACE(rs_get_aml_length); /* Traverse entire list of internal resource descriptors */ - while (resource) { + resource_end = + ACPI_ADD_PTR(struct acpi_resource, resource, resource_list_size); + while (resource < resource_end) { /* Validate the descriptor type */ |
