aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/imx-wm8962.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/fsl/imx-wm8962.c')
-rw-r--r--sound/soc/fsl/imx-wm8962.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-wm8962.c b/sound/soc/fsl/imx-wm8962.c
index 722afe69169e..72064e995687 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)
266 data->card.late_probe = imx_wm8962_late_probe; 266 data->card.late_probe = imx_wm8962_late_probe;
267 data->card.set_bias_level = imx_wm8962_set_bias_level; 267 data->card.set_bias_level = imx_wm8962_set_bias_level;
268 268
269 ret = snd_soc_register_card(&data->card); 269 ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
270 if (ret) { 270 if (ret) {
271 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); 271 dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
272 goto clk_fail; 272 goto clk_fail;
@@ -296,7 +296,6 @@ static int imx_wm8962_remove(struct platform_device *pdev)
296 296
297 if (!IS_ERR(data->codec_clk)) 297 if (!IS_ERR(data->codec_clk))
298 clk_disable_unprepare(data->codec_clk); 298 clk_disable_unprepare(data->codec_clk);
299 snd_soc_unregister_card(&data->card);
300 299
301 return 0; 300 return 0;
302} 301}
@@ -311,6 +310,7 @@ static struct platform_driver imx_wm8962_driver = {
311 .driver = { 310 .driver = {
312 .name = "imx-wm8962", 311 .name = "imx-wm8962",
313 .owner = THIS_MODULE, 312 .owner = THIS_MODULE,
313 .pm = &snd_soc_pm_ops,
314 .of_match_table = imx_wm8962_dt_ids, 314 .of_match_table = imx_wm8962_dt_ids,
315 }, 315 },
316 .probe = imx_wm8962_probe, 316 .probe = imx_wm8962_probe,