]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: Intel: mrfld: Fix runtime pm calls in sst_open_pcm_stream
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Thu, 30 Oct 2014 05:08:54 +0000 (10:38 +0530)
committerMark Brown <broonie@kernel.org>
Fri, 31 Oct 2014 12:29:50 +0000 (12:29 +0000)
It's already done in open/close.

Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/sst/sst_drv_interface.c

index 183b1eb95c0e76eecba128c581f0aa7e448d48fa..4187057fb9334f07e39cc2e2aa84c122575453f2 100644 (file)
@@ -163,16 +163,11 @@ static int sst_open_pcm_stream(struct device *dev,
        if (!str_param)
                return -EINVAL;
 
-       retval = pm_runtime_get_sync(ctx->dev);
-       if (retval < 0)
-               return retval;
        retval = sst_get_stream(ctx, str_param);
-       if (retval > 0) {
+       if (retval > 0)
                ctx->stream_cnt++;
-       } else {
+       else
                dev_err(ctx->dev, "sst_get_stream returned err %d\n", retval);
-               sst_pm_runtime_put(ctx);
-       }
 
        return retval;
 }
@@ -212,7 +207,8 @@ put:
        stream->period_elapsed = NULL;
        ctx->stream_cnt--;
 
-       sst_pm_runtime_put(ctx);
+       if (retval)
+               dev_err(ctx->dev, "free stream returned err %d\n", retval);
 
        dev_dbg(ctx->dev, "Exit\n");
        return 0;