[GIT PULL] Another sound fix for 6.1-rc5

[GIT PULL] Another sound fix for 6.1-rc5

[Takashi Iwai]

Linus,

please pull sound fix for v6.1-rc5 from:

  git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-6.1-rc5

The topmost commit is 9d8e536d36e75e76614fe09ffab9a1df95b8b666

----------------------------------------------------------------

Additional sound fix for 6.1-rc5

This contains a regression fix for the latest memalloc helper change.

----------------------------------------------------------------

Takashi Iwai (1):
      ALSA: memalloc: Try dma_alloc_noncontiguous() at first

---
 sound/core/memalloc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index 6a81aaab25ab..ba095558b6d1 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -542,8 +542,10 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size)
 	struct sg_table *sgt;
 	void *p;
 
+	sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
+				      DEFAULT_GFP, 0);
 #ifdef CONFIG_SND_DMA_SGBUF
-	if (!get_dma_ops(dmab->dev.dev)) {
+	if (!sgt && !get_dma_ops(dmab->dev.dev)) {
 		if (dmab->dev.type == SNDRV_DMA_TYPE_DEV_WC_SG)
 			dmab->dev.type = SNDRV_DMA_TYPE_DEV_WC_SG_FALLBACK;
 		else
@@ -551,9 +553,6 @@ static void *snd_dma_noncontig_alloc(struct snd_dma_buffer *dmab, size_t size)
 		return snd_dma_sg_fallback_alloc(dmab, size);
 	}
 #endif
-
-	sgt = dma_alloc_noncontiguous(dmab->dev.dev, size, dmab->dev.dir,
-				      DEFAULT_GFP, 0);
 	if (!sgt)
 		return NULL;
 

Re: [GIT PULL] Another sound fix for 6.1-rc5

[pr-tracker-bot]

The pull request you sent on Sat, 12 Nov 2022 10:40:40 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git tags/sound-fix-6.1-rc5

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f95077acac6d3235735a41cc5f25a024777399dd

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html