projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
drivers
/
power
/
charger-manager.c
diff --git
a/drivers/power/charger-manager.c
b/drivers/power/charger-manager.c
index
9e4dab4
..
7098a1c
100644
(file)
--- 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);
{
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)
}
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;
}
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;
}
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++;
/* 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);
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;
schedule_work(&setup_polling);
return 0;