ASoC: soc-generic-dmaengine-pcm: Fix error handling (13012809) · Commits · 戴 / test

sound/soc/soc-generic-dmaengine-pcm.c

+9 −7

Original line number	Original line	Diff line number	Diff line
	@@ -117,7 +117,6 @@ dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component,
	struct dma_chan *chan = pcm->chan[substream->stream];		struct dma_chan *chan = pcm->chan[substream->stream];
	struct snd_dmaengine_dai_dma_data *dma_data;		struct snd_dmaengine_dai_dma_data *dma_data;
	struct snd_pcm_hardware hw;		struct snd_pcm_hardware hw;
	int ret;

	if (pcm->config && pcm->config->pcm_hardware)		if (pcm->config && pcm->config->pcm_hardware)
	return snd_soc_set_runtime_hwparams(substream,		return snd_soc_set_runtime_hwparams(substream,
	@@ -138,12 +137,15 @@ dmaengine_pcm_set_runtime_hwparams(struct snd_soc_component *component,
	if (pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)		if (pcm->flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
	hw.info \|= SNDRV_PCM_INFO_BATCH;		hw.info \|= SNDRV_PCM_INFO_BATCH;

	ret = snd_dmaengine_pcm_refine_runtime_hwparams(substream,		/**
			* FIXME: Remove the return value check to align with the code
			* before adding snd_dmaengine_pcm_refine_runtime_hwparams
			* function.
			*/
			snd_dmaengine_pcm_refine_runtime_hwparams(substream,
	dma_data,		dma_data,
	&hw,		&hw,
	chan);		chan);
	if (ret)
	return ret;

	return snd_soc_set_runtime_hwparams(substream, &hw);		return snd_soc_set_runtime_hwparams(substream, &hw);
	}		}