Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 26 Oct 2017 07:45:39 +0000 (09:45 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 26 Oct 2017 07:45:39 +0000 (09:45 +0200)
1  2 
sound/soc/rockchip/rockchip_i2s.c

index b6590467fd140c9cbfa8e802af70a5fe390da9f4,a7972c2d4e7be61ef2aee303da56eebe61dfa158..908211e1d6fcb46eb8e0d7d8401a892967ba156a
@@@ -579,8 -579,10 +579,8 @@@ static int rockchip_i2s_probe(struct pl
        int val;
  
        i2s = devm_kzalloc(&pdev->dev, sizeof(*i2s), GFP_KERNEL);
 -      if (!i2s) {
 -              dev_err(&pdev->dev, "Can't allocate rk_i2s_dev\n");
 +      if (!i2s)
                return -ENOMEM;
 -      }
  
        i2s->dev = &pdev->dev;
  
@@@ -692,7 -694,6 +692,6 @@@ static int rockchip_i2s_remove(struct p
        if (!pm_runtime_status_suspended(&pdev->dev))
                i2s_runtime_suspend(&pdev->dev);
  
-       clk_disable_unprepare(i2s->mclk);
        clk_disable_unprepare(i2s->hclk);
  
        return 0;