All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: sdp4430: Fix string for FM input name
@ 2011-07-06 18:18 Peter Ujfalusi
  2011-08-09  7:29 ` Péter Ujfalusi
  2011-09-26 10:37 ` Péter Ujfalusi
  0 siblings, 2 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2011-07-06 18:18 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, Misael Lopez Cruz; +Cc: alsa-devel

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>
---
 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 a951774..d462f1a 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: sdp4430: Fix string for FM input name
  2011-07-06 18:18 [PATCH] ASoC: sdp4430: Fix string for FM input name Peter Ujfalusi
@ 2011-08-09  7:29 ` Péter Ujfalusi
  2011-08-09 12:47   ` Liam Girdwood
  2011-08-09 14:33   ` Mark Brown
  2011-09-26 10:37 ` Péter Ujfalusi
  1 sibling, 2 replies; 5+ messages in thread
From: Péter Ujfalusi @ 2011-08-09  7:29 UTC (permalink / raw)
  To: alsa-devel; +Cc: Lopez Cruz, Misael, Mark Brown, Girdwood, Liam

Hi Mark, Liam,

On Wednesday 06 July 2011 20:18:05 Ujfalusi, Peter wrote:
> 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

> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  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 a951774..d462f1a 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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: sdp4430: Fix string for FM input name
  2011-08-09  7:29 ` Péter Ujfalusi
@ 2011-08-09 12:47   ` Liam Girdwood
  2011-08-09 14:33   ` Mark Brown
  1 sibling, 0 replies; 5+ messages in thread
From: Liam Girdwood @ 2011-08-09 12:47 UTC (permalink / raw)
  To: Ujfalusi, Peter
  Cc: alsa-devel@alsa-project.org, Mark Brown, Lopez Cruz, Misael

On 09/08/11 08:29, Ujfalusi, Peter wrote:
> Hi Mark, Liam,
> 
> On Wednesday 06 July 2011 20:18:05 Ujfalusi, Peter wrote:
>> 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.

> Thanks,
> Peter
> 
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>> ---
>>  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 a951774..d462f1a 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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: sdp4430: Fix string for FM input name
  2011-08-09  7:29 ` Péter Ujfalusi
  2011-08-09 12:47   ` Liam Girdwood
@ 2011-08-09 14:33   ` Mark Brown
  1 sibling, 0 replies; 5+ messages in thread
From: Mark Brown @ 2011-08-09 14:33 UTC (permalink / raw)
  To: Péter Ujfalusi; +Cc: alsa-devel, Girdwood, Liam, Lopez Cruz, Misael

On Tue, Aug 09, 2011 at 10:29:22AM +0300, Péter Ujfalusi wrote:
> On Wednesday 06 July 2011 20:18:05 Ujfalusi, Peter wrote:
> > 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.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ASoC: sdp4430: Fix string for FM input name
  2011-07-06 18:18 [PATCH] ASoC: sdp4430: Fix string for FM input name Peter Ujfalusi
  2011-08-09  7:29 ` Péter Ujfalusi
@ 2011-09-26 10:37 ` Péter Ujfalusi
  1 sibling, 0 replies; 5+ messages in thread
From: Péter Ujfalusi @ 2011-09-26 10:37 UTC (permalink / raw)
  To: alsa-devel; +Cc: Lopez Cruz, Misael, Mark Brown, Girdwood, Liam

Hi Liam,

On Wednesday 06 July 2011 20:18:05 Ujfalusi, Peter wrote:
> 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

> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  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 a951774..d462f1a 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)

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-09-26 10:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-06 18:18 [PATCH] ASoC: sdp4430: Fix string for FM input name Peter Ujfalusi
2011-08-09  7:29 ` Péter Ujfalusi
2011-08-09 12:47   ` Liam Girdwood
2011-08-09 14:33   ` Mark Brown
2011-09-26 10:37 ` Péter Ujfalusi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.