Merge "soc: qcom: bam_dmux: Fix deinit/reinit race condition" (49cae9d7) · Commits · e / devices / android_kernel_sony_msm8994

drivers/soc/qcom/bam_dmux.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2308,6 +2308,8 @@ void msm_bam_dmux_deinit(void)
		{
		restart_notifier_cb(NULL, SUBSYS_BEFORE_SHUTDOWN, NULL);
		restart_notifier_cb(NULL, SUBSYS_AFTER_SHUTDOWN, NULL);
		in_global_reset = 0;
		in_ssr = 0;
		}
		EXPORT_SYMBOL(msm_bam_dmux_deinit);

		@@ -2316,14 +2318,13 @@ EXPORT_SYMBOL(msm_bam_dmux_deinit);
		*/
		void msm_bam_dmux_reinit(void)
		{
		bam_mux_initialized = 0;
		bam_ops->smsm_state_cb_register_ptr(SMSM_MODEM_STATE,
		SMSM_A2_POWER_CONTROL,
		bam_dmux_smsm_cb, NULL);
		bam_ops->smsm_state_cb_register_ptr(SMSM_MODEM_STATE,
		SMSM_A2_POWER_CONTROL_ACK,
		bam_dmux_smsm_ack_cb, NULL);
		bam_mux_initialized = 0;
		bam_init();
		}
		EXPORT_SYMBOL(msm_bam_dmux_reinit);