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/nuc900/nuc900-ac97.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/nuc900/nuc900-ac97.c')
| -rw-r--r-- | sound/soc/nuc900/nuc900-ac97.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c index 81b09d740ed9..6384bb6dacfd 100644 --- a/sound/soc/nuc900/nuc900-ac97.c +++ b/sound/soc/nuc900/nuc900-ac97.c @@ -356,7 +356,7 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev) if (ret) goto out; - ret = snd_soc_register_component(&pdev->dev, &nuc900_ac97_component, + ret = devm_snd_soc_register_component(&pdev->dev, &nuc900_ac97_component, &nuc900_ac97_dai, 1); if (ret) goto out; @@ -373,8 +373,6 @@ out: static int nuc900_ac97_drvremove(struct platform_device *pdev) { - snd_soc_unregister_component(&pdev->dev); - nuc900_ac97_data = NULL; snd_soc_set_ac97_ops(NULL); |