Merge "ASoC: msm: qdp6v2: handle proxy read failure" (d63da54e) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/msm/qdsp6v2/msm-pcm-afe-v2.c

+8 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -130,6 +130,7 @@ static enum hrtimer_restart afe_hrtimer_rec_callback(struct hrtimer *hrt)
		struct snd_pcm_substream *substream = prtd->substream;
		struct snd_pcm_runtime *runtime = substream->runtime;
		u32 mem_map_handle = 0;
		int ret;

		mem_map_handle = afe_req_mmap_handle(prtd->audio_client);
		if (!mem_map_handle)
		@@ -139,10 +140,15 @@ static enum hrtimer_restart afe_hrtimer_rec_callback(struct hrtimer *hrt)
		if (prtd->dsp_cnt == runtime->periods)
		prtd->dsp_cnt = 0;
		pr_debug("%s: mem_map_handle 0x%x\n", __func__, mem_map_handle);
		afe_rt_proxy_port_read(
		ret = afe_rt_proxy_port_read(
		(prtd->dma_addr + (prtd->dsp_cnt
		* snd_pcm_lib_period_bytes(prtd->substream))), mem_map_handle,
		snd_pcm_lib_period_bytes(prtd->substream));
		if (ret < 0) {
		pr_err("%s: AFE port read fails: %d\n", __func__, ret);
		prtd->start = 0;
		return HRTIMER_NORESTART;
		}
		prtd->dsp_cnt++;
		pr_debug("sending frame rec to DSP: poll_time: %d\n",
		prtd->poll_time);