Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71e3d6cc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: battery: Initialize work struct before cancelling work"

parents a4c0cd2e d3590829

drivers/power/supply/qcom/battery.c

+7 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2018 The Linux Foundation. All rights reserved.

/* Copyright (c) 2018,2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1606,6 +1606,12 @@ int qcom_batt_init(int smb_version) 
	if (!chip->pl_ws)

		goto cleanup;



	INIT_DELAYED_WORK(&chip->status_change_work, status_change_work);

	INIT_WORK(&chip->pl_taper_work, pl_taper_work);

	INIT_WORK(&chip->pl_disable_forever_work, pl_disable_forever_work);

	INIT_DELAYED_WORK(&chip->pl_awake_work, pl_awake_work);

	INIT_DELAYED_WORK(&chip->fcc_stepper_work, fcc_stepper_work);



	chip->fcc_votable = create_votable("FCC", VOTE_MIN,

					pl_fcc_vote_callback,

					chip);
@@ -1660,12 +1666,6 @@ int qcom_batt_init(int smb_version) 


	vote(chip->pl_disable_votable, PL_INDIRECT_VOTER, true, 0);



	INIT_DELAYED_WORK(&chip->status_change_work, status_change_work);

	INIT_WORK(&chip->pl_taper_work, pl_taper_work);

	INIT_WORK(&chip->pl_disable_forever_work, pl_disable_forever_work);

	INIT_DELAYED_WORK(&chip->pl_awake_work, pl_awake_work);

	INIT_DELAYED_WORK(&chip->fcc_stepper_work, fcc_stepper_work);



	rc = pl_register_notifier(chip);

	if (rc < 0) {

		pr_err("Couldn't register psy notifier rc = %d\n", rc);