Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf

[~andy/linux] / sound / soc / soc-utils.c

diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c
index 4220bb0f27301aa962964b9eb645fd0f5e51e17c..60053709e417b0bdcecc81d13ac676fc885021e7 100644 (file)
--- a/sound/soc/soc-utils.c
+++ b/sound/soc/soc-utils.c
@@ -89,14 +89,32 @@ static struct snd_soc_platform_driver dummy_platform = {
        .ops = &dummy_dma_ops,
 };
 
+static struct snd_soc_codec_driver dummy_codec;
+static struct snd_soc_dai_driver dummy_dai = {
+       .name = "snd-soc-dummy-dai",
+};
+
 static __devinit int snd_soc_dummy_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_platform(&pdev->dev, &dummy_platform);
+       int ret;
+
+       ret = snd_soc_register_codec(&pdev->dev, &dummy_codec, &dummy_dai, 1);
+       if (ret < 0)
+               return ret;
+
+       ret = snd_soc_register_platform(&pdev->dev, &dummy_platform);
+       if (ret < 0) {
+               snd_soc_unregister_codec(&pdev->dev);
+               return ret;
+       }
+
+       return ret;
 }
 
 static __devexit int snd_soc_dummy_remove(struct platform_device *pdev)
 {
        snd_soc_unregister_platform(&pdev->dev);
+       snd_soc_unregister_codec(&pdev->dev);
 
        return 0;
 }