commit 85332c06ed2b84a0dc85cb5ef26546e6ba5649f8
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 01 01:28:06 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 01 01:28:05 2013 -0700
tree c56e182b95da59c1ba9df53789eb95af6be562d3
parent 6e475dd9a2903c3deb9c82a9e127564564fed9a4
parent f4e7649b46365676e1f2882be2203a0533ab9e05

Merge "msm: thermal: Initialize voltage rails pointers to NULL"

drivers/thermal/msm_thermal.c

diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c
index ab59864..51a11a4 100644
--- a/drivers/thermal/msm_thermal.c
+++ b/drivers/thermal/msm_thermal.c
@@ -1435,6 +1435,8 @@
 	char *key = NULL;
 	struct device_node *child_node = NULL;
 
+	rails = NULL;
+
 	key = "qcom,vdd-restriction-temp";
 	ret = of_property_read_u32(node, key, &data->vdd_rstr_temp_degC);
 	if (ret)
@@ -1531,6 +1533,8 @@
 	int j = 0;
 	char *key = NULL;
 
+	psm_rails = NULL;
+
 	key = "qcom,pmic-sw-mode-temp";
 	ret = of_property_read_u32(node, key, &data->psm_temp_degC);
 	if (ret)