Applied "ASoC: topology: Fix to store enum text values" to the asoc tree

Commit Message

Mark Brown April 11, 2017, 6:37 p.m. UTC

The patch

   ASoC: topology: Fix to store enum text values

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

From b6e38b2944f1153199becefb14ae3ee01778863e Mon Sep 17 00:00:00 2001
From: Mousumi Jana <[e-mail]>
Date: Tue, 11 Apr 2017 13:06:22 +0530
Subject: [PATCH] ASoC: topology: Fix to store enum text values

Add missing enum texts store in soc_enum.

Signed-off-by: Mousumi Jana <[e-mail]>
Signed-off-by: Pardha Saradhi K <[e-mail]>
Signed-off-by: Kranthikumar, GudishaX <[e-mail]>
Signed-off-by: Subhransu S. Prusty <[e-mail]>
Acked-by: Liam Girdwood <[e-mail]>
Signed-off-by: Mark Brown <[e-mail]>
---
 sound/soc/soc-topology.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 65670b2b408c..8e3df8ba9b68 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -934,6 +934,7 @@  static int soc_tplg_denum_create_texts(struct soc_enum *se,
 		}
 	}
 
+	se->texts = (const char * const *)se->dobj.control.dtexts;
 	return 0;
 
 err: