1 files changed, 4 insertions, 8 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 2595611e8a6d..4201bfe2e9b9 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1390,8 +1390,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                         return ret;
         }
 
-        ret = snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
-                                         &ssi_private->cpu_dai_drv, 1);
+        ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component,
+                                              &ssi_private->cpu_dai_drv, 1);
         if (ret) {
                 dev_err(&pdev->dev, "failed to register DAI: %d\n", ret);
                 goto error_asoc_register;
@@ -1404,13 +1404,13 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                 if (ret < 0) {
                         dev_err(&pdev->dev, "could not claim irq %u\n",
                                         ssi_private->irq);
-                        goto error_irq;
+                        goto error_asoc_register;
                 }
         }
 
         ret = fsl_ssi_debugfs_create(&ssi_private->dbg_stats, &pdev->dev);
         if (ret)
-                goto error_irq;
+                goto error_asoc_register;
 
         /*
          * If codec-handle property is missing from SSI node, we assume
@@ -1451,9 +1451,6 @@ done:
 error_sound_card:
         fsl_ssi_debugfs_remove(&ssi_private->dbg_stats);
 
-error_irq:
-        snd_soc_unregister_component(&pdev->dev);
-
 error_asoc_register:
         if (ssi_private->soc->imx)
                 fsl_ssi_imx_clean(pdev, ssi_private);
@@ -1469,7 +1466,6 @@ static int fsl_ssi_remove(struct platform_device *pdev)
 
         if (ssi_private->pdev)
                 platform_device_unregister(ssi_private->pdev);
-        snd_soc_unregister_component(&pdev->dev);
 
         if (ssi_private->soc->imx)
                 fsl_ssi_imx_clean(pdev, ssi_private);