Merge remote-tracking branch 'asoc/fix/spear' into asoc-next (40bac28e) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/spear/spear_pcm.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -149,9 +149,9 @@ static void spear_pcm_free(struct snd_pcm *pcm)

		static u64 spear_pcm_dmamask = DMA_BIT_MASK(32);

		static int spear_pcm_new(struct snd_card *card,
		struct snd_soc_dai dai, struct snd_pcm pcm)
		static int spear_pcm_new(struct snd_soc_pcm_runtime *rtd)
		{
		struct snd_card *card = rtd->card->snd_card;
		int ret;

		if (!card->dev->dma_mask)
		@@ -159,16 +159,16 @@ static int spear_pcm_new(struct snd_card *card,
		if (!card->dev->coherent_dma_mask)
		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);

		if (dai->driver->playback.channels_min) {
		ret = spear_pcm_preallocate_dma_buffer(pcm,
		if (rtd->cpu_dai->driver->playback.channels_min) {
		ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,
		SNDRV_PCM_STREAM_PLAYBACK,
		spear_pcm_hardware.buffer_bytes_max);
		if (ret)
		return ret;
		}

		if (dai->driver->capture.channels_min) {
		ret = spear_pcm_preallocate_dma_buffer(pcm,
		if (rtd->cpu_dai->driver->capture.channels_min) {
		ret = spear_pcm_preallocate_dma_buffer(rtd->pcm,
		SNDRV_PCM_STREAM_CAPTURE,
		spear_pcm_hardware.buffer_bytes_max);
		if (ret)