summaryrefslogtreecommitdiffstats
path: root/kernel/sound/soc/pxa/hx4700.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sound/soc/pxa/hx4700.c')
-rw-r--r--kernel/sound/soc/pxa/hx4700.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/sound/soc/pxa/hx4700.c b/kernel/sound/soc/pxa/hx4700.c
index 9f8be7cd5..ecbf2873b 100644
--- a/kernel/sound/soc/pxa/hx4700.c
+++ b/kernel/sound/soc/pxa/hx4700.c
@@ -193,7 +193,7 @@ static int hx4700_audio_probe(struct platform_device *pdev)
return ret;
snd_soc_card_hx4700.dev = &pdev->dev;
- ret = snd_soc_register_card(&snd_soc_card_hx4700);
+ ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_hx4700);
if (ret)
gpio_free_array(hx4700_audio_gpios,
ARRAY_SIZE(hx4700_audio_gpios));
@@ -203,8 +203,6 @@ static int hx4700_audio_probe(struct platform_device *pdev)
static int hx4700_audio_remove(struct platform_device *pdev)
{
- snd_soc_unregister_card(&snd_soc_card_hx4700);
-
gpio_set_value(GPIO92_HX4700_HP_DRIVER, 0);
gpio_set_value(GPIO107_HX4700_SPK_nSD, 0);