diff options
author | Mark Brown | 2013-11-20 16:20:24 +0100 |
---|---|---|
committer | Mark Brown | 2013-11-20 16:20:24 +0100 |
commit | 8b880f48eef80309da6d1c40f7526614b19ab12c (patch) | |
tree | 1ae728f4e2c4020d62940e8cdae75a5352bc3ae1 /sound/soc/pxa/mmp-sspa.c | |
parent | Linux 3.12 (diff) | |
parent | ASoC: ab8500: Revert to using custom I/O functions (diff) | |
download | kernel-qcow2-linux-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.gz kernel-qcow2-linux-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.xz kernel-qcow2-linux-8b880f48eef80309da6d1c40f7526614b19ab12c.zip |
Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus
Diffstat (limited to 'sound/soc/pxa/mmp-sspa.c')
-rw-r--r-- | sound/soc/pxa/mmp-sspa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/pxa/mmp-sspa.c b/sound/soc/pxa/mmp-sspa.c index 41752a5fe3b0..5bf5f1f7cac5 100644 --- a/sound/soc/pxa/mmp-sspa.c +++ b/sound/soc/pxa/mmp-sspa.c @@ -455,8 +455,8 @@ static int asoc_mmp_sspa_probe(struct platform_device *pdev) priv->dai_fmt = (unsigned int) -1; platform_set_drvdata(pdev, priv); - return snd_soc_register_component(&pdev->dev, &mmp_sspa_component, - &mmp_sspa_dai, 1); + return devm_snd_soc_register_component(&pdev->dev, &mmp_sspa_component, + &mmp_sspa_dai, 1); } static int asoc_mmp_sspa_remove(struct platform_device *pdev) @@ -466,7 +466,6 @@ static int asoc_mmp_sspa_remove(struct platform_device *pdev) clk_disable(priv->audio_clk); clk_put(priv->audio_clk); clk_put(priv->sysclk); - snd_soc_unregister_component(&pdev->dev); return 0; } |