diff options
| author | Mark Brown <broonie@kernel.org> | 2018-10-21 18:59:23 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 18:59:23 +0300 |
| commit | 65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch) | |
| tree | e8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/soc/atmel/atmel_ssc_dai.c | |
| parent | 576b354ac25b544a31f27c365410d59fcbfee064 (diff) | |
| parent | 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 (diff) | |
| download | linux-65dfb6d6dd2850f3f99f08536d2b14190350c854.tar.xz | |
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/soc/atmel/atmel_ssc_dai.c')
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index d3b69682d9c2..6291ec7f9dd6 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -1005,11 +1005,11 @@ static int asoc_ssc_init(struct device *dev) struct ssc_device *ssc = dev_get_drvdata(dev); int ret; - ret = snd_soc_register_component(dev, &atmel_ssc_component, + ret = devm_snd_soc_register_component(dev, &atmel_ssc_component, &atmel_ssc_dai, 1); if (ret) { dev_err(dev, "Could not register DAI: %d\n", ret); - goto err; + return ret; } if (ssc->pdata->use_dma) @@ -1019,15 +1019,10 @@ static int asoc_ssc_init(struct device *dev) if (ret) { dev_err(dev, "Could not register PCM: %d\n", ret); - goto err_unregister_dai; + return ret; } return 0; - -err_unregister_dai: - snd_soc_unregister_component(dev); -err: - return ret; } static void asoc_ssc_exit(struct device *dev) @@ -1038,8 +1033,6 @@ static void asoc_ssc_exit(struct device *dev) atmel_pcm_dma_platform_unregister(dev); else atmel_pcm_pdc_platform_unregister(dev); - - snd_soc_unregister_component(dev); } /** |