1 files changed, 17 insertions, 1 deletions

diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 9073ada88835..e9f28e075cf8 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -575,7 +575,23 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag)
 
 static int acpi_thermal_get_trip_points(struct acpi_thermal *tz)
 {
-        return acpi_thermal_trips_update(tz, ACPI_TRIPS_INIT);
+        int i, valid, ret = acpi_thermal_trips_update(tz, ACPI_TRIPS_INIT);
+
+        if (ret)
+                return ret;
+
+        valid = tz->trips.critical.flags.valid |
+                tz->trips.hot.flags.valid |
+                tz->trips.passive.flags.valid;
+
+        for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
+                valid |= tz->trips.active[i].flags.valid;
+
+        if (!valid) {
+                printk(KERN_WARNING FW_BUG "No valid trip found\n");
+                return -ENODEV;
+        }
+        return 0;
 }
 
 static void acpi_thermal_check(void *data)