Merge remote-tracking branches 'spi/topic/ath97', 'spi/topic/atmel', 'spi/topic/au155...

[firefly-linux-kernel-4.4.55.git] / drivers / power / charger-manager.c

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 1c202ccbd2a61e741d7dd820a5b22741874dd50e..907293e6f2a4a3fafacd13fa4390955541eed694 100644 (file)
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -619,7 +619,7 @@ static int cm_get_battery_temperature(struct charger_manager *cm,
 
 #ifdef CONFIG_THERMAL
        if (cm->tzd_batt) {
-               ret = thermal_zone_get_temp(cm->tzd_batt, (unsigned long *)temp);
+               ret = thermal_zone_get_temp(cm->tzd_batt, temp);
                if (!ret)
                        /* Calibrate temperature unit */
                        *temp /= 100;