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

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

Merge "msm: pil: Replace disable_irq_nosync with disable_irq wherever required"

parents e320f637 bd16ec91

arch/arm/mach-msm/pil-pronto.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int wcnss_shutdown(const struct subsys_desc *subsys, bool force_stop) 
{

	struct pronto_data *drv = subsys_to_drv(subsys);



	disable_irq_nosync(drv->subsys_desc.wdog_bite_irq);

	disable_irq(drv->subsys_desc.wdog_bite_irq);

	pil_shutdown(&drv->desc);

	return 0;

}

arch/arm/mach-msm/pil-q6v5-lpass.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static int adsp_shutdown(const struct subsys_desc *subsys, bool force_stop) 
		mb();

	}

	pil_shutdown(&drv->q6->desc);

	disable_irq_nosync(drv->subsys_desc.wdog_bite_irq);

	disable_irq(drv->subsys_desc.wdog_bite_irq);



	pr_debug("ADSP is Down\n");

	adsp_set_state("OFFLINE");