Merge "ASoC: wcd_cpe_core: Fix handling of deregister event" (d84f4c91) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

sound/soc/codecs/wcd_cpe_core.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -1126,7 +1126,8 @@ static void wcd_cpe_svc_event_cb(const struct cpe_svc_notification *param)
		}

		dev_dbg(core->dev,
		"%s: event = 0x%x\n", __func__, param->event);
		"%s: event = 0x%x, ssr_type = 0x%x\n",
		__func__, param->event, core->ssr_type);

		switch (param->event) {
		case CPE_SVC_ONLINE:
		@@ -1144,7 +1145,14 @@ static void wcd_cpe_svc_event_cb(const struct cpe_svc_notification *param)
		break;
		case CPE_SVC_CMI_CLIENTS_DEREG:

		if (core->ssr_type == WCD_CPE_SSR_EVENT)
		/*
		* Only when either CPE SSR is in progress,
		* or the bus is down, we need to mark the CPE
		* as ready. In all other cases, this event is
		* ignored
		*/
		if (core->ssr_type == WCD_CPE_SSR_EVENT \|\|
		core->ssr_type == WCD_CPE_BUS_DOWN_EVENT)
		wcd_cpe_set_and_complete(core,
		WCD_CPE_BLK_READY);
		break;