Skip to contentSkip to conversation

ASoC: sdp4430: Fix string for FM input name

PATCH Superseded Peter Ujfalusi 3 participants 5 messages Jul 6, 2011 – Sep 26, 2011

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

PATCH 1/1 ASoC: sdp4430: Fix string for FM input name

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

---
 sound/soc/omap/sdp4430.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/omap/sdp4430.c +3 -3
index a951774..d462f1a 100644
@@ -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)
Signature · 1 line
1.7.6
#1 lore raw

Hi Mark, Liam,

Quoted 4 lines · Peter

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

Can you take a look at this patch?
I think this shall go for 3.1 as a fix.

Thanks,
Peter

Quoted 30 lines
---
 sound/soc/omap/sdp4430.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/omap/sdp4430.c +3 -3
index a951774..d462f1a 100644
@@ -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)
#2 lore raw
Quoted 11 lines · Peter

Hi Mark, Liam,

Quoted 4 lines · Peter

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

Can you take a look at this patch?
I think this shall go for 3.1 as a fix.

I'll pull this with your others once Mark gets a chance to have a look.

Quoted 33 lines

Thanks,
Peter

Quoted 30 lines
---
 sound/soc/omap/sdp4430.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/omap/sdp4430.c +3 -3
index a951774..d462f1a 100644
@@ -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)
Acked-by
#3 lore raw
In reply to Péter Ujfalusi
Quoted 8 lines · Péter Ujfalusi
Quoted 4 lines · Peter

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

Can you take a look at this patch?
I think this shall go for 3.1 as a fix.

#4 lore raw
In reply to Peter Ujfalusi

Hi Liam,

Quoted 4 lines · Peter

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

Can you take a look at this, and ack it, so Mark can pick it up?

Thanks,
Péter

Quoted 30 lines
---
 sound/soc/omap/sdp4430.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/omap/sdp4430.c +3 -3
index a951774..d462f1a 100644
@@ -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)