Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 165504
b: refs/heads/master
c: 2e83a5c
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Mack authored and Anton Vorontsov committed Jul 30, 2009
1 parent d31742b commit 47e1d51
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4aed03ae58946c716c8e3f7060f8b500b8a8e30f
refs/heads/master: 2e83a5c5d2317c386de2880eb43ef0bef8eb1fa9
12 changes: 6 additions & 6 deletions trunk/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 47e1d51

Please sign in to comment.