From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 26 Jun 2024 20:11:13 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v6.11-rc1~108^2~9^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be8f4de61417c65715a7f7661ce4770414c9a5a0;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'for-linus' into for-next

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

be8f4de61417c65715a7f7661ce4770414c9a5a0
diff --cc sound/core/pcm_dmaengine.c
index 4f18511f1c92e,cc5db93b9132c..b54336d4bffcb
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@@ -349,8 -349,23 +349,18 @@@ int snd_dmaengine_pcm_open_request_chan
  }
  EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
  
+ int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
+ {
+ 	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+ 
+ 	dmaengine_synchronize(prtd->dma_chan);
+ 
+ 	return 0;
+ }
+ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);
+ 
 -/**
 - * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
 - * @substream: PCM substream
 - *
 - * Return: 0 on success, a negative error code otherwise
 - */
 -int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)
 +static void __snd_dmaengine_pcm_close(struct snd_pcm_substream *substream,
 +				      bool release_channel)
  {
  	struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
  	struct dma_tx_state state;