These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / power / charger-manager.c

diff --git a/kernel/drivers/power/charger-manager.c b/kernel/drivers/power/charger-manager.c
index 0aed13f..1ea5d1a 100644 (file)
--- a/kernel/drivers/power/charger-manager.c
+++ b/kernel/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;
@@ -1581,8 +1581,10 @@ static struct charger_desc *of_cm_parse_desc(struct device *dev)
                                cables = devm_kzalloc(dev, sizeof(*cables)
                                                * chg_regs->num_cables,
                                                GFP_KERNEL);
-                               if (!cables)
+                               if (!cables) {
+                                       of_node_put(child);
                                        return ERR_PTR(-ENOMEM);
+                               }
 
                                chg_regs->cables = cables;
 
@@ -1768,7 +1770,8 @@ static int charger_manager_probe(struct platform_device *pdev)
 
        INIT_DELAYED_WORK(&cm->fullbatt_vchk_work, fullbatt_vchk);
 
-       cm->charger_psy = power_supply_register(NULL, &cm->charger_psy_desc,
+       cm->charger_psy = power_supply_register(&pdev->dev,
+                                               &cm->charger_psy_desc,
                                                &psy_cfg);
        if (IS_ERR(cm->charger_psy)) {
                dev_err(&pdev->dev, "Cannot register charger-manager with name \"%s\"\n",