From b209ae6d34d94a7933ec6e27715bfc7976229d13 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 9 Jan 2012 12:36:24 +0000 Subject: [PATCH] --- yaml --- r: 293187 b: refs/heads/master c: 7aca69f9fe8f04ca37a01e2540960c53b24e3223 h: refs/heads/master i: 293185: 1d0dc2fe953648d34f2b2d50362c799187e98928 293183: 87c198dc719b3c65d13b87fe7cc0dbb3aafd14b1 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-utils.c | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b49e64acd7f4..df3801ddcc07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08656910bb80882aaad739faea6dac3a0818f71c +refs/heads/master: 7aca69f9fe8f04ca37a01e2540960c53b24e3223 diff --git a/trunk/sound/soc/soc-utils.c b/trunk/sound/soc/soc-utils.c index 4220bb0f2730..60053709e417 100644 --- a/trunk/sound/soc/soc-utils.c +++ b/trunk/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; }