diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-23 19:25:29 +0100 |
| commit | 5561f17f2629cdacf5bc43e0f839ca6434db2c20 (patch) | |
| tree | c0e1acfcc969c81d5d072ee3b512a934d99a7ec2 /sound/soc/samsung/spdif.c | |
| parent | 423a5e0fd46de6bd92c52b2ef136856929eeb649 (diff) | |
| parent | d486fea6babfe3ff0c382c9e4baf18f535fcee7d (diff) | |
| download | linux-stable-5561f17f2629cdacf5bc43e0f839ca6434db2c20.tar.gz linux-stable-5561f17f2629cdacf5bc43e0f839ca6434db2c20.tar.bz2 linux-stable-5561f17f2629cdacf5bc43e0f839ca6434db2c20.zip | |
Merge remote-tracking branch 'asoc/topic/davinci' into asoc-next
Diffstat (limited to 'sound/soc/samsung/spdif.c')
| -rw-r--r-- | sound/soc/samsung/spdif.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 5008e5bd6ed8..2e5ebb2f1982 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c @@ -357,6 +357,10 @@ static struct snd_soc_dai_driver samsung_spdif_dai = { .resume = spdif_resume, }; +static const struct snd_soc_component_driver samsung_spdif_component = { + .name = "samsung-spdif", +}; + static int spdif_probe(struct platform_device *pdev) { struct s3c_audio_pdata *spdif_pdata; @@ -424,7 +428,8 @@ static int spdif_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, spdif); - ret = snd_soc_register_dai(&pdev->dev, &samsung_spdif_dai); + ret = snd_soc_register_component(&pdev->dev, &samsung_spdif_component, + &samsung_spdif_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "fail to register dai\n"); goto err4; @@ -445,7 +450,7 @@ static int spdif_probe(struct platform_device *pdev) return 0; err5: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); err4: iounmap(spdif->regs); err3: @@ -466,7 +471,7 @@ static int spdif_remove(struct platform_device *pdev) struct resource *mem_res; asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); iounmap(spdif->regs); |