diff --git a/[refs] b/[refs]
index 34ecb4e6b377..a2ab901b4d5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13cb03aef0c062dcdd16b411bd4c02c1574ff08
+refs/heads/master: 4f89038f177462dbd2fd911297fd004226176db7
diff --git a/trunk/drivers/thermal/cpu_cooling.c b/trunk/drivers/thermal/cpu_cooling.c
index 5f5c780bcd90..768b508f0d69 100644
--- a/trunk/drivers/thermal/cpu_cooling.c
+++ b/trunk/drivers/thermal/cpu_cooling.c
@@ -303,12 +303,12 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev,
 	struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;
 	struct cpumask *mask = &cpufreq_device->allowed_cpus;
 	unsigned int cpu;
-	unsigned long count = 0;
+	unsigned int count = 0;
 	int ret;
 
 	cpu = cpumask_any(mask);
 
-	ret = get_property(cpu, 0, (unsigned int *)&count, GET_MAXL);
+	ret = get_property(cpu, 0, &count, GET_MAXL);
 
 	if (count > 0)
 		*state = count;