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

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

Merge "msm: krait-regulator: fix up CPU_UP_CANCELED handling"

parents e4aaf55f c3013b55

arch/arm/mach-msm/krait-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ static int krait_regulator_cpu_callback(struct notifier_block *nfb, 
			(int)action, cpu, cpu_online(cpu));

	switch (action & ~CPU_TASKS_FROZEN) {

	case CPU_UP_PREPARE:

	case CPU_UP_CANCELED:

		mutex_lock(&pvreg->krait_power_vregs_lock);

		kvreg->force_bhs = true;

		/*
@@ -1066,7 +1067,6 @@ static int krait_regulator_cpu_callback(struct notifier_block *nfb, 
		__switch_to_using_bhs(kvreg);

		mutex_unlock(&pvreg->krait_power_vregs_lock);

		break;

	case CPU_UP_CANCELED:

	case CPU_ONLINE:

		mutex_lock(&pvreg->krait_power_vregs_lock);

		kvreg->force_bhs = false;