Skip to content

Commit

Permalink
ds2760_battery: delay power supply registration
Browse files Browse the repository at this point in the history
This fixes a race condition I recently introduced with the PMOD feature
addition (cef437e: "w1: ds2760_battery: add support for sleep mode
feature").

Postpone the call to power_supply_register() to fix it.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
Acked-by: Matt Reimer <mreimer@vpop.net>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
  • Loading branch information
Daniel Mack authored and Anton Vorontsov committed Jul 30, 2009
1 parent 4aed03a commit 2e83a5c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/power/ds2760_battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,12 +381,6 @@ static int ds2760_battery_probe(struct platform_device *pdev)

di->charge_status = POWER_SUPPLY_STATUS_UNKNOWN;

retval = power_supply_register(&pdev->dev, &di->bat);
if (retval) {
dev_err(di->dev, "failed to register battery\n");
goto batt_failed;
}

/* enable sleep mode feature */
ds2760_battery_read_status(di);
status = di->raw[DS2760_STATUS_REG];
Expand All @@ -397,6 +391,12 @@ static int ds2760_battery_probe(struct platform_device *pdev)

ds2760_battery_write_status(di, status);

retval = power_supply_register(&pdev->dev, &di->bat);
if (retval) {
dev_err(di->dev, "failed to register battery\n");
goto batt_failed;
}

INIT_DELAYED_WORK(&di->monitor_work, ds2760_battery_work);
di->monitor_wqueue = create_singlethread_workqueue(dev_name(&pdev->dev));
if (!di->monitor_wqueue) {
Expand Down

0 comments on commit 2e83a5c

Please sign in to comment.