diff options
| author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2015-05-19 09:16:30 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-05-23 20:06:19 +0200 |
| commit | 4970d839aa1574e4e998cdc423864a50743931ff (patch) | |
| tree | a32e3ef6c07c6c48d778eaacfae689fa95c69671 /drivers/power | |
| parent | power_supply: Use wrappers to avoid races when registering power supply (diff) | |
| download | linux-4970d839aa1574e4e998cdc423864a50743931ff.tar.xz linux-4970d839aa1574e4e998cdc423864a50743931ff.zip | |
power_supply: charger-manager: Add parent for power supply
The 'parent' argument passed to power_supply_register() is now used to
postpone callbacks to the driver until the driver's probe end.
Pass current device from charger-manager to utilize that. This will move
created power supply from virtual to platform devices.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/charger-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index 0aed13f90891..1c202ccbd2a6 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -1768,7 +1768,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", |