Skip to content

Fix register/unregister of usb and wall #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MateuszKrawczuk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix register/unregister of usb and wall #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions src/bq2589x_charger.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ struct bq2589x {
struct delayed_work pe_volt_tune_work;
struct delayed_work check_pe_tuneup_work;

struct power_supply usb;
struct power_supply wall;
struct power_supply *usb;
struct power_supply *wall;
struct power_supply *batt_psy;
};

Expand Down Expand Up @@ -933,24 +933,15 @@ static int bq2589x_psy_register(struct bq2589x *bq)
{
int ret;

struct power_supply_desc *usbdesc;
struct power_supply_desc *walldesc;

bq->usb = devm_power_supply_register(&(bq->dev),
&bq2589x_usb_desc,
NULL);

ret = devm_power_supply_register(bq->dev,
bq->usb = power_supply_register(bq->dev,
&bq2589x_usb_desc,
NULL);
if (ret < 0) {
dev_err(bq->dev, "%s:failed to register usb psy:%d\n", __func__, ret);
return ret;
}

bq->wall.desc = bq2589x_wall_desc;

ret = power_supply_register(bq->dev, &bq->wall, NULL);
bq->wall = power_supply_register(bq->dev, &bq2589x_wall_desc, NULL);
if (ret < 0) {
dev_err(bq->dev, "%s:failed to register wall psy:%d\n", __func__, ret);
goto fail_1;
Expand All @@ -959,15 +950,15 @@ static int bq2589x_psy_register(struct bq2589x *bq)
return 0;

fail_1:
power_supply_unregister(&bq->usb);
power_supply_unregister(bq->usb);

return ret;
}

static void bq2589x_psy_unregister(struct bq2589x *bq)
{
power_supply_unregister(&bq->usb);
power_supply_unregister(&bq->wall);
power_supply_unregister(bq->usb);
power_supply_unregister(bq->wall);
}

static ssize_t bq2589x_show_registers(struct device *dev,
Expand Down