From f462a80596d973222129a351c597dc74648ff208 Mon Sep 17 00:00:00 2001
From: Eduardo Valentin <eduardo.valentin@ti.com>
Date: Wed, 2 Jan 2013 15:29:42 +0000
Subject: [PATCH] --- yaml --- r: 359765 b: refs/heads/master c:
 6b2aa51d698492e8dc0a0ce6ce5b3193ccaec269 h: refs/heads/master i:   359763:
 98c98a67b67041d6ec1f8333e2539b515b57ef62 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/thermal/thermal_sys.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);