diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
| commit | 65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch) | |
| tree | e8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/soc/txx9/txx9aclc-ac97.c | |
| parent | Merge branch 'asoc-4.19' into asoc-linus (diff) | |
| parent | ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks (diff) | |
| download | linux-dev-65dfb6d6dd2850f3f99f08536d2b14190350c854.tar.xz linux-dev-65dfb6d6dd2850f3f99f08536d2b14190350c854.zip | |
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/soc/txx9/txx9aclc-ac97.c')
| -rw-r--r-- | sound/soc/txx9/txx9aclc-ac97.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c index e2ad00e3cae1..1cfca698ae4b 100644 --- a/sound/soc/txx9/txx9aclc-ac97.c +++ b/sound/soc/txx9/txx9aclc-ac97.c @@ -208,13 +208,12 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) if (err < 0) return err; - return snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component, + return devm_snd_soc_register_component(&pdev->dev, &txx9aclc_ac97_component, &txx9aclc_ac97_dai, 1); } static int txx9aclc_ac97_dev_remove(struct platform_device *pdev) { - snd_soc_unregister_component(&pdev->dev); snd_soc_set_ac97_ops(NULL); return 0; } |