diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:27 +0000 |
| commit | 99a0ea2d5bbba87f3cfae7a1ac38846a678ee397 (patch) | |
| tree | 2ec02fae3a06c73057bb3abc0afb781ea812881e /sound/soc/fsl/imx-wm8962.c | |
| parent | ac97d4e00a8356e61806fe7b223c0b7021908577 (diff) | |
| parent | 4fa8dbc18e8a57ea21c63103abdea042ab923202 (diff) | |
Merge remote-tracking branch 'asoc/topic/devm' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-wm8962.c')
| -rw-r--r-- | sound/soc/fsl/imx-wm8962.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c index 722afe69169e..6c6066618f3b 100644 --- a/sound/soc/fsl/imx-wm8962.c +++ b/sound/soc/fsl/imx-wm8962.c @@ -266,7 +266,7 @@ static int imx_wm8962_probe(struct platform_device *pdev) data->card.late_probe = imx_wm8962_late_probe; data->card.set_bias_level = imx_wm8962_set_bias_level; - ret = snd_soc_register_card(&data->card); + ret = devm_snd_soc_register_card(&pdev->dev, &data->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); goto clk_fail; @@ -296,7 +296,6 @@ static int imx_wm8962_remove(struct platform_device *pdev) if (!IS_ERR(data->codec_clk)) clk_disable_unprepare(data->codec_clk); - snd_soc_unregister_card(&data->card); return 0; } |