ASoC: Intel: use lock when changing SST state.

SST state change should be done under sst_lock

Signed-off-by: Mythri P K <mythri.p.k@intel.com>
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>
This commit is contained in:
Mythri P K 2014-10-31 12:38:21 +05:30 committed by Mark Brown
parent d62f2a08b9
commit 45f31bfcda
2 changed files with 2 additions and 4 deletions

View File

@ -463,15 +463,13 @@ static int intel_sst_runtime_resume(struct device *dev)
int ret = 0;
struct intel_sst_drv *ctx = dev_get_drvdata(dev);
mutex_lock(&ctx->sst_lock);
if (ctx->sst_state == SST_RESET) {
ret = sst_load_fw(ctx);
if (ret) {
dev_err(dev, "FW download fail %d\n", ret);
ctx->sst_state = SST_RESET;
sst_set_fw_state_locked(ctx, SST_RESET);
}
}
mutex_unlock(&ctx->sst_lock);
return ret;
}

View File

@ -230,7 +230,7 @@ static void process_fw_init(struct intel_sst_drv *sst_drv_ctx,
dev_dbg(sst_drv_ctx->dev, "*** FW Init msg came***\n");
if (init->result) {
sst_drv_ctx->sst_state = SST_RESET;
sst_set_fw_state_locked(sst_drv_ctx, SST_RESET);
dev_err(sst_drv_ctx->dev, "FW Init failed, Error %x\n",
init->result);
retval = init->result;