diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-03-09 19:37:56 -0700 |
---|---|---|
committer | Darren Etheridge <detheridge@ti.com> | 2014-06-20 15:20:06 -0500 |
commit | a19edb02c48949d2b8a0a4a486c52b6329ae0eec (patch) | |
tree | 1b1b50455ced0a6cf8f4478f741868af653d8fc2 /sound | |
parent | 42d57d9fd7c197dfb42708f59ec7d48a0550e43f (diff) |
ASoC: simple-card: card name can be option
[ Upstream commit 12ffa6fc1958879a81b6af1624c1a2edd83ec04a ]
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>
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/generic/simple-card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 7cabcc5c870..5dd47691ba4 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -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; |