p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

This commit is contained in:
Mark Brown 2016-09-29 12:43:44 -07:00
parent 195dee5647 61ab0d403b
commit 4a1ff03faf
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/intel/atom/sst/sst_ipc.c
View File

@ -267,6 +267,9 @@ static void process_fw_async_msg(struct intel_sst_drv *sst_drv_ctx,
"Period elapsed rcvd for pipe id 0x%x\n", "Period elapsed rcvd for pipe id 0x%x\n",
pipe_id); pipe_id);
stream = &sst_drv_ctx->streams[str_id]; stream = &sst_drv_ctx->streams[str_id];
/* If stream is dropped, skip processing this message*/
if (stream->status == STREAM_INIT)
break;
if (stream->period_elapsed) if (stream->period_elapsed)
stream->period_elapsed(stream->pcm_substream); stream->period_elapsed(stream->pcm_substream);
if (stream->compr_cb) if (stream->compr_cb)

14
sound/soc/intel/atom/sst/sst_pvt.c
View File

@ -279,17 +279,15 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
if (response) { if (response) {
ret = sst_wait_timeout(sst, block); ret = sst_wait_timeout(sst, block);
if (ret < 0) { if (ret < 0)
goto out; goto out;
} else if(block->data) {
if (!data) if (data && block->data) {
goto out; *data = kmemdup(block->data, block->size, GFP_KERNEL);
*data = kzalloc(block->size, GFP_KERNEL); if (!*data) {
if (!(*data)) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} else }
memcpy(data, (void *) block->data, block->size);
} }
} }
out: out: