1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 9e4dab46eefd..7098a1ce2d3c 100644
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -1656,7 +1656,7 @@ static inline struct charger_desc *cm_get_drv_data(struct platform_device *pdev)
 {
         if (pdev->dev.of_node)
                 return of_cm_parse_desc(&pdev->dev);
-        return (struct charger_desc *)dev_get_platdata(&pdev->dev);
+        return dev_get_platdata(&pdev->dev);
 }
 
 static int charger_manager_probe(struct platform_device *pdev)
@@ -1677,7 +1677,7 @@ static int charger_manager_probe(struct platform_device *pdev)
                 }
         }
 
-        if (!desc) {
+        if (IS_ERR(desc)) {
                 dev_err(&pdev->dev, "No platform data (desc) found\n");
                 return -ENODEV;
         }
@@ -1720,6 +1720,11 @@ static int charger_manager_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
+        if (!desc->psy_fuel_gauge) {
+                dev_err(&pdev->dev, "No fuel gauge power supply defined\n");
+                return -EINVAL;
+        }
+
         /* Counting index only */
         while (desc->psy_charger_stat[i])
                 i++;
@@ -1839,6 +1844,13 @@ static int charger_manager_probe(struct platform_device *pdev)
         device_init_wakeup(&pdev->dev, true);
         device_set_wakeup_capable(&pdev->dev, false);
 
+        /*
+         * Charger-manager have to check the charging state right after
+         * tialization of charger-manager and then update current charging
+         * state.
+         */
+        cm_monitor();
+
         schedule_work(&setup_polling);
 
         return 0;