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

Commit 0422e5e0 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next

parents 77c92d2b cef794f7

sound/soc/qcom/lpass-platform.c

+5 −3
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
	struct lpass_data *drvdata =

		snd_soc_platform_get_drvdata(soc_runtime->platform);

	struct lpass_variant *v = drvdata->variant;

	int ret;

	int ret = -EINVAL;

	struct lpass_pcm_data *data;

	size_t size = lpass_platform_pcm_hardware.buffer_bytes_max;
@@ -491,7 +491,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
			data->rdma_ch = v->alloc_dma_channel(drvdata,

						SNDRV_PCM_STREAM_PLAYBACK);



		if (IS_ERR_VALUE(data->rdma_ch))

		if (data->rdma_ch < 0)

			return data->rdma_ch;



		drvdata->substream[data->rdma_ch] = psubstream;
@@ -518,8 +518,10 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) 
			data->wrdma_ch = v->alloc_dma_channel(drvdata,

						SNDRV_PCM_STREAM_CAPTURE);



		if (IS_ERR_VALUE(data->wrdma_ch))

		if (data->wrdma_ch < 0) {

			ret = data->wrdma_ch;

			goto capture_alloc_err;

		}



		drvdata->substream[data->wrdma_ch] = csubstream;