Skip to contentSkip to conversation

ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()

PATCH In review Dan Carpenter 3 participants 3 messages Feb 14, 2018

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()

The dma_mapping_error() returns true or false, but we want to return -ENOMEM if there was an error.

Fixes e98131222ff9 ("ASoC: uniphier: add support for UniPhier AIO compress audio")
sound/soc/uniphier/aio-compress.c +2 -3
index 7f7abe3ae99d..4751c8bdabec 100644
@@ -54,12 +54,11 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd)
 		dma_dir = DMA_TO_DEVICE;
 
 	sub->compr_addr = dma_map_single(dev, sub->compr_area, size, dma_dir);
-	ret = dma_mapping_error(dev, sub->compr_addr);
-	if (ret) {
+	if (dma_mapping_error(dev, sub->compr_addr)) {
 		kfree(sub->compr_area);
 		sub->compr_area = NULL;
 
-		return ret;
+		return -ENOMEM;
 	}
 
 	sub->compr_bytes = size;
Tested-by on v1 1/1
#1 lore raw

Hello,

Thank you for fixing, this patch works fine
on UniPhier LD20 board.

Quoted 30 lines · Dan Carpenter

The dma_mapping_error() returns true or false, but we want to return -ENOMEM if there was an error.

Fixes e98131222ff9 ("ASoC: uniphier: add support for UniPhier AIO compress audio")
sound/soc/uniphier/aio-compress.c +2 -3
index 7f7abe3ae99d..4751c8bdabec 100644
@@ -54,12 +54,11 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd)
  		dma_dir = DMA_TO_DEVICE;
 
  	sub->compr_addr = dma_map_single(dev, sub->compr_area, size, dma_dir);
-	ret = dma_mapping_error(dev, sub->compr_addr);
-	if (ret) {
+	if (dma_mapping_error(dev, sub->compr_addr)) {
  		kfree(sub->compr_area);
  		sub->compr_area = NULL;
 
-		return ret;
+		return -ENOMEM;
  	}
 
  	sub->compr_bytes = size;

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

maintainer
#2 lore raw

Applied "ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()" to the asoc tree

In reply to Dan Carpenter

The patch

ASoC: uniphier: fix an error code in uniphier_aio_comprdma_new()

has been applied to the asoc tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 21957b5bf0ff607e6e0ed55a3a89454e969511ba Mon Sep 17 00:00:00 2001

From: Dan Carpenter <[email protected]>
Date: Wed, 14 Feb 2018 10:15:31 +0300
Subject: [PATCH] ASoC: uniphier: fix an error code in
uniphier_aio_comprdma_new()

The dma_mapping_error() returns true or false, but we want to return -ENOMEM if there was an error.

Fixes e98131222ff9 ("ASoC: uniphier: add support for UniPhier AIO compress audio")
---
 sound/soc/uniphier/aio-compress.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/uniphier/aio-compress.c +2 -3
index 7f7abe3ae99d..4751c8bdabec 100644
@@ -54,12 +54,11 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd)
 		dma_dir = DMA_TO_DEVICE;
 
 	sub->compr_addr = dma_map_single(dev, sub->compr_area, size, dma_dir);
-	ret = dma_mapping_error(dev, sub->compr_addr);
-	if (ret) {
+	if (dma_mapping_error(dev, sub->compr_addr)) {
 		kfree(sub->compr_area);
 		sub->compr_area = NULL;
 
-		return ret;
+		return -ENOMEM;
 	}
 
 	sub->compr_bytes = size;
Signature · 1 line
2.16.1