aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-09 13:45:23 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-09 14:34:28 -0400
commit28d528c8dbab5c6b3cf2fc4f0e91470a9a63dbc0 (patch)
treebdad399a0f7c9e2be0e8a291c78e6d6ebb05198a
parent10884347f18842aa9b8ae18ebb16272d9b7fafa2 (diff)
ASoC: core: Remove pointless error on card registration failure
If we fail to register the card we should say why somewhere else so there's no point in repeating the same thing with less information. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/soc-core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f10f00b5d29f..3a43fa6ba2ee 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1830,13 +1830,7 @@ static int soc_probe(struct platform_device *pdev)
1830 /* Bodge while we unpick instantiation */ 1830 /* Bodge while we unpick instantiation */
1831 card->dev = &pdev->dev; 1831 card->dev = &pdev->dev;
1832 1832
1833 ret = snd_soc_register_card(card); 1833 return snd_soc_register_card(card);
1834 if (ret != 0) {
1835 dev_err(&pdev->dev, "Failed to register card\n");
1836 return ret;
1837 }
1838
1839 return 0;
1840} 1834}
1841 1835
1842static int soc_cleanup_card_resources(struct snd_soc_card *card) 1836static int soc_cleanup_card_resources(struct snd_soc_card *card)