[PATCH resend] ASoC: sdp4430: Fix string for FM input name

[PATCH resend] ASoC: sdp4430: Fix string for FM input name

[Peter Ujfalusi]

From: "Ujfalusi, Peter" <peter.ujfalusi@ti.com>

The name contains invalid valid character (/), which
causes problems when trying to create the debugfs
directory structure:
ASoC: Failed to create Aux/FM Stereo In debugfs file

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
---

Hi Mark, Liam,

Could you take this patch, it has been not taken for upstream.

Thanks,
Peter

 sound/soc/omap/sdp4430.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 249d84b..79ec76d 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -88,7 +88,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
 	SND_SOC_DAPM_MIC("Headset Mic", NULL),
 	SND_SOC_DAPM_HP("Headset Stereophone", NULL),
 	SND_SOC_DAPM_SPK("Earphone Spk", NULL),
-	SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
+	SND_SOC_DAPM_INPUT("FM Stereo In"),
 };
 
 static const struct snd_soc_dapm_route audio_map[] = {
@@ -113,8 +113,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
 	{"Earphone Spk", NULL, "EP"},
 
 	/* Aux/FM Stereo In: AFML, AFMR */
-	{"AFML", NULL, "Aux/FM Stereo In"},
-	{"AFMR", NULL, "Aux/FM Stereo In"},
+	{"AFML", NULL, "FM Stereo In"},
+	{"AFMR", NULL, "FM Stereo In"},
 };
 
 static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
-- 
1.7.6.1

Re: [PATCH resend] ASoC: sdp4430: Fix string for FM input name

[Mark Brown]

On Fri, Sep 30, 2011 at 11:39:50AM +0300, Peter Ujfalusi wrote:
> From: "Ujfalusi, Peter" <peter.ujfalusi@ti.com>
> 
> The name contains invalid valid character (/), which
> causes problems when trying to create the debugfs
> directory structure:
> ASoC: Failed to create Aux/FM Stereo In debugfs file

Applied, thanks.

> Acked-by: Liam Girdwood <lrg@ti.com>

Are you sure...  Liam would've applied it rather than acking it.