* [PATCHv2] ASoC: core: Don't set "(null)" as a driver name
@ 2011-05-20 12:47 Jarkko Nikula
2011-05-20 12:47 ` Liam Girdwood
2011-05-21 10:58 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Jarkko Nikula @ 2011-05-20 12:47 UTC (permalink / raw)
To: alsa-devel; +Cc: Mark Brown, Liam Girdwood
Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name")
writes "(null)" to driver name string in struct snd_card if card->driver_name
is NULL. This causes segmentation faults with some user space ALSA utilities
like aplay and arecord.
Fix this by using the card->name if no driver name is specified.
Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
---
sound/soc/soc-core.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 5968745..bb7cd58 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1930,7 +1930,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
"%s", card->long_name ? card->long_name : card->name);
snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),
- "%s", card->driver_name);
+ "%s", card->driver_name ? card->driver_name : card->name);
if (card->late_probe) {
ret = card->late_probe(card);
--
1.7.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCHv2] ASoC: core: Don't set "(null)" as a driver name
2011-05-20 12:47 [PATCHv2] ASoC: core: Don't set "(null)" as a driver name Jarkko Nikula
@ 2011-05-20 12:47 ` Liam Girdwood
2011-05-21 10:58 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2011-05-20 12:47 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: alsa-devel@alsa-project.org, Mark Brown
On 20/05/11 13:47, Jarkko Nikula wrote:
> Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name")
> writes "(null)" to driver name string in struct snd_card if card->driver_name
> is NULL. This causes segmentation faults with some user space ALSA utilities
> like aplay and arecord.
>
> Fix this by using the card->name if no driver name is specified.
>
> Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
> ---
> sound/soc/soc-core.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
> index 5968745..bb7cd58 100644
> --- a/sound/soc/soc-core.c
> +++ b/sound/soc/soc-core.c
> @@ -1930,7 +1930,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
> snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),
> "%s", card->long_name ? card->long_name : card->name);
> snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),
> - "%s", card->driver_name);
> + "%s", card->driver_name ? card->driver_name : card->name);
>
> if (card->late_probe) {
> ret = card->late_probe(card);
Acked-by: Liam Girdwood <lrg@ti.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCHv2] ASoC: core: Don't set "(null)" as a driver name
2011-05-20 12:47 [PATCHv2] ASoC: core: Don't set "(null)" as a driver name Jarkko Nikula
2011-05-20 12:47 ` Liam Girdwood
@ 2011-05-21 10:58 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2011-05-21 10:58 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: alsa-devel, Liam Girdwood
On Fri, May 20, 2011 at 03:47:40PM +0300, Jarkko Nikula wrote:
> Commit 22de71b ("ASoC: core - allow ASoC more flexible machine name")
> writes "(null)" to driver name string in struct snd_card if card->driver_name
> is NULL. This causes segmentation faults with some user space ALSA utilities
> like aplay and arecord.
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-21 10:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-20 12:47 [PATCHv2] ASoC: core: Don't set "(null)" as a driver name Jarkko Nikula
2011-05-20 12:47 ` Liam Girdwood
2011-05-21 10:58 ` Mark Brown
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.