openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: simple-card: card name can be option 

snd_card.name is now option on DT case.
non-DT case can follow same style,
and it is understandable from platform point of view.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Kuninori Morimoto 2014-03-09 19:37:56 -07:00 committed by Mark Brown
parent 81985bd63f
commit 12ffa6fc19
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/generic/simple-card.c
View File

@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
}
if (!cinfo->name ||
!cinfo->card ||
!cinfo->codec_dai.name ||
!cinfo->codec ||
!cinfo->platform ||
@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
return -EINVAL;
}
priv->snd_card.name = cinfo->card;
priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name;
dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name;
dai_link->platform_name = cinfo->platform;