diff options
| author | Mark Brown <broonie@kernel.org> | 2017-07-03 18:15:04 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-07-03 18:15:04 +0300 |
| commit | 85ee1f42fa60693e5ed72e9453ef6352e72bb4c0 (patch) | |
| tree | c3c524bd6316c4c70b4f93291683ee6fff95eda4 /sound/soc/generic/simple-card.c | |
| parent | 51fa6a8f15ddaaf8ecb0fe75b365c012905341fe (diff) | |
| parent | 8288591368fcb470024348a9b846f7b3f791be44 (diff) | |
| download | linux-85ee1f42fa60693e5ed72e9453ef6352e72bb4c0.tar.xz | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
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 bc136d2bd7cd..1df69701eb12 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -301,15 +301,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: @@ -497,8 +488,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); |