Commit d87a2b75 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki

ACPICA: acpidump: Fix code issue in invoking fread in the loop.

This patch fixes an issue that the while loop is not needed as fread()
should return exact the bytes of expected.

The patch is tested by runing diff against the output of "-c" mode and
the normal mode, and only finds the following differences:
1. table addresses: the "-c" mode will always fill 0x0000000000000000 for
                    the address.
2. RSDP/RSDT/XSDT: there is no generation of such tables for "-c" mode.
So the test result shows the fix is valid.  Lv Zheng.
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent fad6449b
...@@ -1112,7 +1112,6 @@ osl_read_table_from_file(char *filename, ...@@ -1112,7 +1112,6 @@ osl_read_table_from_file(char *filename,
struct acpi_table_header *local_table = NULL; struct acpi_table_header *local_table = NULL;
u32 table_length; u32 table_length;
s32 count; s32 count;
u32 total = 0;
acpi_status status = AE_OK; acpi_status status = AE_OK;
/* Open the file */ /* Open the file */
...@@ -1163,18 +1162,14 @@ osl_read_table_from_file(char *filename, ...@@ -1163,18 +1162,14 @@ osl_read_table_from_file(char *filename,
fseek(table_file, file_offset, SEEK_SET); fseek(table_file, file_offset, SEEK_SET);
while (!feof(table_file) && total < table_length) { count = fread(local_table, 1, table_length, table_file);
count = fread(local_table + total, 1, table_length - total, table_file); if (count != table_length) {
if (count < 0) {
fprintf(stderr, "%4.4s: Could not read table content\n", fprintf(stderr, "%4.4s: Could not read table content\n",
header.signature); header.signature);
status = AE_INVALID_TABLE_LENGTH; status = AE_INVALID_TABLE_LENGTH;
goto exit; goto exit;
} }
total += count;
}
/* Validate checksum */ /* Validate checksum */
(void)ap_is_valid_checksum(local_table); (void)ap_is_valid_checksum(local_table);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment