From a81a030f47b1edcf273bddcc6673115b79d426a9 Mon Sep 17 00:00:00 2001
From: Eduardo Valentin <eduardo.valentin@ti.com>
Date: Thu, 25 Apr 2013 14:13:33 +0000
Subject: [PATCH] --- yaml --- r: 374597 b: refs/heads/master c:
 9b19ec39b0a92b13e487033e81257f9989867710 h: refs/heads/master i:   374595:
 406e63ca5b4ad632c26079c4786857a42bcffe6b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/thermal/thermal_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f764f251fd50..b29bffea6668 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07273d25b87b266be1b0c41e245025c9107d6699
+refs/heads/master: 9b19ec39b0a92b13e487033e81257f9989867710
diff --git a/trunk/drivers/thermal/thermal_core.c b/trunk/drivers/thermal/thermal_core.c
index f36cd44816d8..d755440791b7 100644
--- a/trunk/drivers/thermal/thermal_core.c
+++ b/trunk/drivers/thermal/thermal_core.c
@@ -388,7 +388,7 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, unsigned long *temp)
 	enum thermal_trip_type type;
 #endif
 
-	if (IS_ERR_OR_NULL(tz))
+	if (!tz || IS_ERR(tz))
 		goto exit;
 
 	mutex_lock(&tz->lock);