summaryrefslogtreecommitdiffstats
path: root/kernel/sound/soc/pxa/spitz.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/soc/pxa/spitz.c')
-rw-r--r--kernel/sound/soc/pxa/spitz.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sound/soc/pxa/spitz.c b/kernel/sound/soc/pxa/spitz.c
index 461123ad5..b00222620 100644
--- a/kernel/sound/soc/pxa/spitz.c
+++ b/kernel/sound/soc/pxa/spitz.c
@@ -305,7 +305,7 @@ static int spitz_probe(struct platform_device *pdev)
card->dev = &pdev->dev;
- 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);
@@ -322,9 +322,6 @@ err1:
static int spitz_remove(struct platform_device *pdev)
{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
gpio_free(spitz_mic_gpio);
return 0;
}