diff options
| author | Mark Brown <broonie@kernel.org> | 2017-06-13 21:57:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-06-13 21:57:18 +0100 |
| commit | 03cf603a49a82938b05d9b448938cd0a541ed374 (patch) | |
| tree | 8b3efaa30a6412bbf3807129cbf9986258810343 /sound/soc/generic/simple-card.c | |
| parent | 37fae57931e4fdd5c24ee13826b12e8e1a51d4e1 (diff) | |
| parent | a97a06c7efc1ee34f500171f1c4e9608295bb79a (diff) | |
Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-of-graph
Diffstat (limited to 'sound/soc/generic/simple-card.c')
| -rw-r--r-- | sound/soc/generic/simple-card.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 33ff487193f9..e26bd14ba70f 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -307,15 +307,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, dai_link->ops = &asoc_simple_card_ops; dai_link->init = asoc_simple_card_dai_init; - dev_dbg(dev, "\tname : %s\n", dai_link->stream_name); - dev_dbg(dev, "\tformat : %04x\n", dai_link->dai_fmt); - dev_dbg(dev, "\tcpu : %s / %d\n", - dai_link->cpu_dai_name, - dai_props->cpu_dai.sysclk); - dev_dbg(dev, "\tcodec : %s / %d\n", - dai_link->codec_dai_name, - dai_props->codec_dai.sysclk); - asoc_simple_card_canonicalize_cpu(dai_link, single_cpu); dai_link_of_err: @@ -503,8 +494,10 @@ static int asoc_simple_card_probe(struct platform_device *pdev) snd_soc_card_set_drvdata(card, priv); ret = devm_snd_soc_register_card(dev, card); - if (ret >= 0) - return ret; + if (ret < 0) + goto err; + + return 0; err: asoc_simple_card_clean_reference(card); |