summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2014-03-09 19:37:56 -0700
committerMark Brown <broonie@linaro.org>2014-03-10 07:53:35 +0000
commit12ffa6fc1958879a81b6af1624c1a2edd83ec04a (patch)
tree8d2405b06902be6b19d52bb562825835b5562955
parent81985bd63f6f1711035aa8d97caf2fb203250a95 (diff)
downloadop-kernel-dev-12ffa6fc1958879a81b6af1624c1a2edd83ec04a.zip
op-kernel-dev-12ffa6fc1958879a81b6af1624c1a2edd83ec04a.tar.gz
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>
-rw-r--r--sound/soc/generic/simple-card.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7cabcc5..5dd4769 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;
OpenPOWER on IntegriCloud