summaryrefslogtreecommitdiffstats
path: root/kernel/sound/soc/mxs
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/soc/mxs')
-rw-r--r--kernel/sound/soc/mxs/mxs-sgtl5000.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/sound/soc/mxs/mxs-sgtl5000.c b/kernel/sound/soc/mxs/mxs-sgtl5000.c
index 6e6fce6a1..2b23ffbac 100644
--- a/kernel/sound/soc/mxs/mxs-sgtl5000.c
+++ b/kernel/sound/soc/mxs/mxs-sgtl5000.c
@@ -142,7 +142,7 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev)
card->dev = &pdev->dev;
platform_set_drvdata(pdev, card);
- ret = snd_soc_register_card(card);
+ ret = devm_snd_soc_register_card(&pdev->dev, card);
if (ret) {
dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
ret);
@@ -154,12 +154,8 @@ static int mxs_sgtl5000_probe(struct platform_device *pdev)
static int mxs_sgtl5000_remove(struct platform_device *pdev)
{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
mxs_saif_put_mclk(0);
- snd_soc_unregister_card(card);
-
return 0;
}