Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI: Add DMI entry for Sony VGN-FW41E_H
  ACPI: fix obsolete comment in custom_method.c
  ACPI / thermal: Use mode to enable/disable kernel thermal processing
  ACPI thermal: remove unnecessary newline from exception message
  ACPI sysfs: remove unnecessary newline from exception
  ACPI video: remove unnecessary newline from error messages
  ACPI: SRAT: report non-volatile memory in debug
  ACPI: Rework acpi_get_child() to be more efficient

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index da079d4e0baa..8470771e5eae 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -288,7 +288,7 @@ do {	\
         if (flags != ACPI_TRIPS_INIT)   \
                 ACPI_EXCEPTION((AE_INFO, AE_ERROR,      \
                 "ACPI thermal trip point %s changed\n"  \
-                "Please send acpidump to linux-acpi@vger.kernel.org\n", str)); \
+                "Please send acpidump to linux-acpi@vger.kernel.org", str)); \
 } while (0)
 
 static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
@@ -531,6 +531,10 @@ static void acpi_thermal_check(void *data)
 {
         struct acpi_thermal *tz = data;
 
+        if (!tz->tz_enabled) {
+                pr_warn("thermal zone is disabled \n");
+                return;
+        }
         thermal_zone_device_update(tz->thermal_zone);
 }