Merge tag 'v3.18-rc2' into asoc-sgtl5000

Linux 3.18-rc2

2 files changed, 9 insertions, 1 deletions

diff --git a/tools/power/acpi/os_specific/service_layers/osunixxf.c b/tools/power/acpi/os_specific/service_layers/osunixxf.c
index 60b58cd18410..7ccb073f8316 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixxf.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixxf.c
@@ -122,6 +122,14 @@ static void os_enter_line_edit_mode(void)
 {
         struct termios local_term_attributes;
 
+        term_attributes_were_set = 0;
+
+        /* STDIN must be a terminal */
+
+        if (!isatty(STDIN_FILENO)) {
+                return;
+        }
+
         /* Get and keep the original attributes */
 
         if (tcgetattr(STDIN_FILENO, &original_term_attributes)) {
diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
index 53cee781e24e..24d32968802d 100644
--- a/tools/power/acpi/tools/acpidump/apdump.c
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -146,7 +146,7 @@ u32 ap_get_table_length(struct acpi_table_header *table)
 
         if (ACPI_VALIDATE_RSDP_SIG(table->signature)) {
                 rsdp = ACPI_CAST_PTR(struct acpi_table_rsdp, table);
-                return (rsdp->length);
+                return (acpi_tb_get_rsdp_length(rsdp));
         }
 
         /* Normal ACPI table */