Merge changes Ibb65d718,I5619b14f into msm-3.4
* changes:
arm/dt: msm8974: Add device tree for MSM8974 CDP
thermal: tsens8974: Fix NULL pointer dereference
diff --git a/arch/arm/boot/dts/msm8974-cdp.dts b/arch/arm/boot/dts/msm8974-cdp.dts
new file mode 100644
index 0000000..29edf30
--- /dev/null
+++ b/arch/arm/boot/dts/msm8974-cdp.dts
@@ -0,0 +1,21 @@
+/* Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+
+/include/ "msm8974.dtsi"
+
+/ {
+ model = "Qualcomm MSM 8974 CDP";
+ compatible = "qcom,msm8974-cdp", "qcom,msm8974";
+ qcom,msm-id = <126 1 0>;
+};
diff --git a/drivers/thermal/msm8974-tsens.c b/drivers/thermal/msm8974-tsens.c
index 0628d2e..2dd698a 100644
--- a/drivers/thermal/msm8974-tsens.c
+++ b/drivers/thermal/msm8974-tsens.c
@@ -771,7 +771,7 @@
static int __devinit _tsens_register_thermal(void)
{
- struct platform_device *pdev = tmdev->pdev;
+ struct platform_device *pdev;
int rc, i;
if (!tmdev) {
@@ -779,6 +779,8 @@
return -ENODEV;
}
+ pdev = tmdev->pdev;
+
for (i = 0; i < tmdev->tsens_num_sensor; i++) {
char name[18];
snprintf(name, sizeof(name), "tsens_tz_sensor%d", i);