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

Commit 0bbc0a0a authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

parents 569dbb88 c9ccaa0c

drivers/regulator/core.c

+10 −2
Original line number Original line Diff line number Diff line
@@ -2396,6 +2396,14 @@ static void regulator_disable_work(struct work_struct *work) 
	count = rdev->deferred_disables;

	count = rdev->deferred_disables;

	rdev->deferred_disables = 0;

	rdev->deferred_disables = 0;





	/*

	 * Workqueue functions queue the new work instance while the previous

	 * work instance is being processed. Cancel the queued work instance

	 * as the work instance under processing does the job of the queued

	 * work instance.

	 */

	cancel_delayed_work(&rdev->disable_work);



	for (i = 0; i < count; i++) {

	for (i = 0; i < count; i++) {

		ret = _regulator_disable(rdev);

		ret = _regulator_disable(rdev);

		if (ret != 0)

		if (ret != 0)
@@ -2439,10 +2447,10 @@ int regulator_disable_deferred(struct regulator *regulator, int ms) 




	mutex_lock(&rdev->mutex);

	mutex_lock(&rdev->mutex);

	rdev->deferred_disables++;

	rdev->deferred_disables++;

	mod_delayed_work(system_power_efficient_wq, &rdev->disable_work,

			 msecs_to_jiffies(ms));

	mutex_unlock(&rdev->mutex);

	mutex_unlock(&rdev->mutex);





	queue_delayed_work(system_power_efficient_wq, &rdev->disable_work,

			   msecs_to_jiffies(ms));

	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(regulator_disable_deferred);

EXPORT_SYMBOL_GPL(regulator_disable_deferred);