| Message ID | 1410530416-30200-4-git-send-email-hanjun.guo@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 12 Sep 2014 22:00:01 +0800, Hanjun Guo <hanjun.guo@linaro.org> wrote: > From: Tomasz Nowicki <tomasz.nowicki@linaro.org> > > It is very useful to traverse all available table entries without max > number of expected entries type. Current acpi_parse_entries() > implementation gives that feature but it does not count those entries, > it returns 0 instead, so fix it to count matched and successfully > entries and return it. > > NOTE: This change has no impact to x86 and ia64 archs since existing code > checks for error occurrence only (acpi_parse_entries(...,0) < 0). > > Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org> > Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Grant Likely <grant.likely@linaro.org> > --- > drivers/acpi/tables.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c > index 21ae521..b18e45e 100644 > --- a/drivers/acpi/tables.c > +++ b/drivers/acpi/tables.c > @@ -225,10 +225,13 @@ acpi_parse_entries(unsigned long table_size, > while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) < > table_end) { > if (entry->type == entry_id > - && (!max_entries || count++ < max_entries)) > + && (!max_entries || count < max_entries)) { > if (handler(entry, table_end)) > return -EINVAL; > > + count++; > + } > + > /* > * If entry->length is 0, break from this loop to avoid > * infinite loop. > -- > 1.7.9.5 >
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 21ae521..b18e45e 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -225,10 +225,13 @@ acpi_parse_entries(unsigned long table_size, while (((unsigned long)entry) + sizeof(struct acpi_subtable_header) < table_end) { if (entry->type == entry_id - && (!max_entries || count++ < max_entries)) + && (!max_entries || count < max_entries)) { if (handler(entry, table_end)) return -EINVAL; + count++; + } + /* * If entry->length is 0, break from this loop to avoid * infinite loop.