[Xen-devel] [PATCH v2 1/2] ACPI/table: Always count matched and successfully parsed entries

[Shannon Zhao <zhaoshenglong@xxxxxxxxxx>]

From: Tomasz Nowicki <tomasz.nowicki@xxxxxxxxxx>

Ported from Linux commit 4ceacd02f5a1795c5c697e0345ee10beef675290.

acpi_parse_entries() allows to traverse all available table entries (aka
subtables) by passing max_entries parameter equal to 0, but since its count
variable is only incremented if max_entries is not 0, the function always
returns 0 for max_entries equal to 0.  It would be more useful if it returned
the number of entries matched instead, so make it increment count in that
case too.

Acked-by: Grant Likely <grant.likely@xxxxxxxxxx>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@xxxxxxxxxx>
Signed-off-by: Hanjun Guo <hanjun.guo@xxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Shannon Zhao <shannon.zhao@xxxxxxxxxx>
---
 xen/drivers/acpi/tables.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c
index e57cf2a..1da2127 100644
--- a/xen/drivers/acpi/tables.c
+++ b/xen/drivers/acpi/tables.c
@@ -239,10 +239,13 @@ acpi_table_parse_entries(char *id,
                }
 
                if (entry->type == entry_id
-                   && (!max_entries || count++ < max_entries))
+                   && (!max_entries || count < max_entries)) {
                        if (handler(entry, table_end))
                                return -EINVAL;
 
+                       count++;
+               }
+
                entry = (struct acpi_subtable_header *)
                    ((unsigned long)entry + entry->length);
        }
-- 
2.0.4



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel