diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 1cf49912dc96ca146d9cd4a5618f59576a9c26a1..49e3cb07ae9e82e364284cae22349963af0c400c 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -760,6 +760,7 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)
 	mutex_lock(&thermal_list_lock);
 	list_for_each_entry(tz, &thermal_tz_list, node) {
 		if (tz->id == id) {
+			get_device(&tz->device);
 			match = tz;
 			break;
 		}
diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c
index dc535831b6609204f00b909c4a08a3338aba4a8b..5a9a6d1ddd03d1bbebdf1dc43aa658de07029595 100644
--- a/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@ -463,8 +463,10 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p)
 		return -EINVAL;
 
 	start_trip = nla_nest_start(msg, THERMAL_GENL_ATTR_TZ_TRIP);
-	if (!start_trip)
+	if (!start_trip) {
+		put_device(&tz->device);
 		return -EMSGSIZE;
+	}
 
 	mutex_lock(&tz->lock);
 
@@ -489,10 +491,13 @@ static int thermal_genl_cmd_tz_get_trip(struct param *p)
 
 	nla_nest_end(msg, start_trip);
 
+	put_device(&tz->device);
+
 	return 0;
 
 out_cancel_nest:
 	mutex_unlock(&tz->lock);
+	put_device(&tz->device);
 
 	return -EMSGSIZE;
 }
@@ -514,13 +519,17 @@ static int thermal_genl_cmd_tz_get_temp(struct param *p)
 
 	ret = thermal_zone_get_temp(tz, &temp);
 	if (ret)
-		return ret;
+		goto out;
 
 	if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_ID, id) ||
-	    nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TEMP, temp))
-		return -EMSGSIZE;
+	    nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_TEMP, temp)) {
+		ret = -EMSGSIZE;
+		goto out;
+	}
 
-	return 0;
+out:
+	put_device(&tz->device);
+	return ret;
 }
 
 static int thermal_genl_cmd_tz_get_gov(struct param *p)
@@ -542,10 +551,13 @@ static int thermal_genl_cmd_tz_get_gov(struct param *p)
 
 	if (nla_put_u32(msg, THERMAL_GENL_ATTR_TZ_ID, id) ||
 	    nla_put_string(msg, THERMAL_GENL_ATTR_TZ_GOV_NAME,
-			   tz->governor->name))
+			   tz->governor->name)) {
+		put_device(&tz->device);
 		ret = -EMSGSIZE;
+	}
 
 	mutex_unlock(&tz->lock);
+	put_device(&tz->device);
 
 	return ret;
 }