diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f46c44048e44742332cddc7de1be15ce57ef0d4a..dc047336cc373c19ad5ed68e74cda2d60ca4c1e8 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -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);
 }