Skip to contentSkip to conversation

ASoC: Intel: Skylake: Fix uninitialized return

PATCH In review Subhransu S. Prusty 3 participants 3 messages Aug 23, 2017 – Aug 25, 2017

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

PATCH 1/1 ASoC: Intel: Skylake: Fix uninitialized return

On failure to get dsp_ops, dsp_init returns error without assigning ret. ret is assigned in code path which will never be executed. Fix it.

Fixes f77d443c4c29 ("ASoC: Intel: Skylake: Fix to free resources for dsp_init failure"
---
 sound/soc/intel/skylake/skl-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-messages.c +1 -1
index f0f11f597b21..697d07bc1b5a 100644
@@ -278,8 +278,8 @@ int skl_init_dsp(struct skl *skl)
 
 	ops = skl_get_dsp_ops(skl->pci->device);
 	if (!ops) {
-		goto unmap_mmio;
 		ret = -EIO;
+		goto unmap_mmio;
 	}
 
 	loader_ops = ops->loader_ops();
Signature · 1 line
1.9.1
maintainer
#1 lore raw

Applied "ASoC: Intel: Skylake: Fix uninitialized return" to the asoc tree

The patch

ASoC: Intel: Skylake: Fix uninitialized return

has been applied to the asoc tree at

git://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 9149916f1e8c912c585ddebf12a98e99bd81aafe Mon Sep 17 00:00:00 2001

From: "Subhransu S. Prusty" <[email protected]>
Date: Wed, 23 Aug 2017 19:37:12 +0530
Subject: [PATCH] ASoC: Intel: Skylake: Fix uninitialized return

On failure to get dsp_ops, dsp_init returns error without assigning ret. ret is assigned in code path which will never be executed. Fix it.

Fixes f77d443c4c29 ("ASoC: Intel: Skylake: Fix to free resources for dsp_init failure"
---
 sound/soc/intel/skylake/skl-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-messages.c +1 -1
index f0f11f597b21..697d07bc1b5a 100644
@@ -278,8 +278,8 @@ int skl_init_dsp(struct skl *skl)
 
 	ops = skl_get_dsp_ops(skl->pci->device);
 	if (!ops) {
-		goto unmap_mmio;
 		ret = -EIO;
+		goto unmap_mmio;
 	}
 
 	loader_ops = ops->loader_ops();
Signature · 1 line
2.14.1
Acked-by on v1 1/1
#2 lore raw
In reply to Subhransu S. Prusty
Quoted 2 lines · Subhransu S. Prusty

On failure to get dsp_ops, dsp_init returns error without assigning ret. ret is assigned in code path which will never be executed. Fix it.

Quoted 24 lines
Fixes f77d443c4c29 ("ASoC: Intel: Skylake: Fix to free resources for dsp_init failure"
---
 sound/soc/intel/skylake/skl-messages.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/skylake/skl-messages.c +1 -1
index f0f11f597b21..697d07bc1b5a 100644
@@ -278,8 +278,8 @@ int skl_init_dsp(struct skl *skl)
 
 	ops = skl_get_dsp_ops(skl->pci->device);
 	if (!ops) {
-		goto unmap_mmio;
 		ret = -EIO;
+		goto unmap_mmio;
 	}
 
 	loader_ops = ops->loader_ops();
Signature · 1 line
1.9.1
Signature · 1 line
~Vinod