summaryrefslogtreecommitdiff
path: root/sound/soc/intel
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2014-10-30 10:38:54 +0530
committerMark Brown <broonie@kernel.org>2014-10-31 12:29:50 +0000
commit1a6db0bd26a72027d6a5ea006d64d4021fd0326e (patch)
treea23764f49ffb136caf72fe77869d0b57ca343575 /sound/soc/intel
parent0d2135ecadb0b2eec5338a7587ba29724ddf612b (diff)
ASoC: Intel: mrfld: Fix runtime pm calls in sst_open_pcm_stream
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>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r--sound/soc/intel/sst/sst_drv_interface.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/intel/sst/sst_drv_interface.c b/sound/soc/intel/sst/sst_drv_interface.c
index 183b1eb95c0e..4187057fb933 100644
--- a/sound/soc/intel/sst/sst_drv_interface.c
+++ b/sound/soc/intel/sst/sst_drv_interface.c
@@ -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;