diff --git a/[refs] b/[refs]
index 195c8c0f5850..ac5a5a1d9150 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 923e0b1e8dbe0939d9fc41c226dfc5d53884d8c6
+refs/heads/master: 6b2aa51d698492e8dc0a0ce6ce5b3193ccaec269
diff --git a/trunk/drivers/thermal/thermal_sys.c b/trunk/drivers/thermal/thermal_sys.c
index fba27c36d707..0a1bf6b032ea 100644
--- a/trunk/drivers/thermal/thermal_sys.c
+++ b/trunk/drivers/thermal/thermal_sys.c
@@ -1530,6 +1530,9 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
 	if (!ops || !ops->get_temp)
 		return ERR_PTR(-EINVAL);
 
+	if (trips > 0 && !ops->get_trip_type)
+		return ERR_PTR(-EINVAL);
+
 	tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL);
 	if (!tz)
 		return ERR_PTR(-ENOMEM);