diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:29:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:29:07 +0200 |
| commit | bac931259addd4ca8f705b534ab693c1b367ca1d (patch) | |
| tree | eff070cdcae6c02c315fb81a7b65a8e95596f74e /drivers/power/tps65217_charger.c | |
| parent | x86/mce: Do not use bank 1 for APEI generated error logs (diff) | |
| parent | Linux 4.7-rc6 (diff) | |
| download | linux-bac931259addd4ca8f705b534ab693c1b367ca1d.tar.xz linux-bac931259addd4ca8f705b534ab693c1b367ca1d.zip | |
Merge tag 'v4.7-rc6' into ras/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/power/tps65217_charger.c')
| -rw-r--r-- | drivers/power/tps65217_charger.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/power/tps65217_charger.c b/drivers/power/tps65217_charger.c index d9f56730c735..73dfae41def8 100644 --- a/drivers/power/tps65217_charger.c +++ b/drivers/power/tps65217_charger.c @@ -197,6 +197,7 @@ static int tps65217_charger_probe(struct platform_device *pdev) { struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent); struct tps65217_charger *charger; + struct power_supply_config cfg = {}; int ret; dev_dbg(&pdev->dev, "%s\n", __func__); @@ -208,9 +209,12 @@ static int tps65217_charger_probe(struct platform_device *pdev) charger->tps = tps; charger->dev = &pdev->dev; + cfg.of_node = pdev->dev.of_node; + cfg.drv_data = charger; + charger->ac = devm_power_supply_register(&pdev->dev, &tps65217_charger_desc, - NULL); + &cfg); if (IS_ERR(charger->ac)) { dev_err(&pdev->dev, "failed: power supply register\n"); return PTR_ERR(charger->ac); |