target/linux/mediatek/patches-4.14/0180-ASoC-mediatek-fix-error-handling-in-mt2701_afe_pcm_d.patch

   1 From 17508c32dd65649d2617c1c52b32b02bdb54b793 Mon Sep 17 00:00:00 2001
   2 From: Ryder Lee <ryder.lee@mediatek.com>
   3 Date: Tue, 2 Jan 2018 19:47:18 +0800
   4 Subject: [PATCH 180/224] ASoC: mediatek: fix error handling in
   5  mt2701_afe_pcm_dev_probe()
   6
   7 Fix unbalanced error handling path which will get incorrect counts
   8 if probe failed. The .remove() should be adjusted accordingly.
   9
  10 Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
  11 Tested-by: Garlic Tseng <garlic.tseng@mediatek.com>
  12 Signed-off-by: Mark Brown <broonie@kernel.org>
  13 ---
  14  sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 31 ++++++++++++++----------------
  15  1 file changed, 14 insertions(+), 17 deletions(-)
  16
  17 diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
  18 index 8fda182f849b..a7362d1cda1b 100644
  19 --- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
  20 +++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
  21 @@ -1590,12 +1590,16 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
  22         }
  23
  24         platform_set_drvdata(pdev, afe);
  25 -       pm_runtime_enable(&pdev->dev);
  26 -       if (!pm_runtime_enabled(&pdev->dev))
  27 -               goto err_pm_disable;
  28 -       pm_runtime_get_sync(&pdev->dev);
  29
  30 -       ret = snd_soc_register_platform(&pdev->dev, &mtk_afe_pcm_platform);
  31 +       pm_runtime_enable(dev);
  32 +       if (!pm_runtime_enabled(dev)) {
  33 +               ret = mt2701_afe_runtime_resume(dev);
  34 +               if (ret)
  35 +                       goto err_pm_disable;
  36 +       }
  37 +       pm_runtime_get_sync(dev);
  38 +
  39 +       ret = snd_soc_register_platform(dev, &mtk_afe_pcm_platform);
  40         if (ret) {
  41                 dev_warn(dev, "err_platform\n");
  42                 goto err_platform;
  43 @@ -1610,35 +1614,28 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
  44                 goto err_dai_component;
  45         }
  46
  47 -       mt2701_afe_runtime_resume(&pdev->dev);
  48 -
  49         return 0;
  50
  51  err_dai_component:
  52 -       snd_soc_unregister_component(&pdev->dev);
  53 -
  54 +       snd_soc_unregister_platform(dev);
  55  err_platform:
  56 -       snd_soc_unregister_platform(&pdev->dev);
  57 -
  58 +       pm_runtime_put_sync(dev);
  59  err_pm_disable:
  60 -       pm_runtime_disable(&pdev->dev);
  61 +       pm_runtime_disable(dev);
  62
  63         return ret;
  64  }
  65
  66  static int mt2701_afe_pcm_dev_remove(struct platform_device *pdev)
  67  {
  68 -       struct mtk_base_afe *afe = platform_get_drvdata(pdev);
  69 -
  70 +       pm_runtime_put_sync(&pdev->dev);
  71         pm_runtime_disable(&pdev->dev);
  72         if (!pm_runtime_status_suspended(&pdev->dev))
  73                 mt2701_afe_runtime_suspend(&pdev->dev);
  74 -       pm_runtime_put_sync(&pdev->dev);
  75
  76         snd_soc_unregister_component(&pdev->dev);
  77         snd_soc_unregister_platform(&pdev->dev);
  78 -       /* disable afe clock */
  79 -       mt2701_afe_disable_clock(afe);
  80 +
  81         return 0;
  82  }
  83
  84 --
  85 2.11.0
  86