]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: core: Remove pointless error on card registration failure
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 17:45:23 +0000 (18:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Aug 2012 18:34:28 +0000 (19:34 +0100)
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>
sound/soc/soc-core.c

index f10f00b5d29fb490df2505c8abf8923a93aa535c..3a43fa6ba2ee7ba0b6006cfefa60c671f5ca3396 100644 (file)
@@ -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)