From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 9 Aug 2012 17:45:23 +0000 (+0100)
Subject: ASoC: core: Remove pointless error on card registration failure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=28d528c8;p=deliverable%2Flinux.git

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>
---

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)
 	/* Bodge while we unpick instantiation */
 	card->dev = &pdev->dev;
 
-	ret = snd_soc_register_card(card);
-	if (ret != 0) {
-		dev_err(&pdev->dev, "Failed to register card\n");
-		return ret;
-	}
-
-	return 0;
+	return snd_soc_register_card(card);
 }
 
 static int soc_cleanup_card_resources(struct snd_soc_card *card)