Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus (4a1ff03f) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/intel/atom/sst/sst_ipc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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",
		pipe_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)
		stream->period_elapsed(stream->pcm_substream);
		if (stream->compr_cb)

+6 −8

Original line number	Diff line number	Diff line
		@@ -279,17 +279,15 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,

		if (response) {
		ret = sst_wait_timeout(sst, block);
		if (ret < 0) {
		goto out;
		} else if(block->data) {
		if (!data)
		if (ret < 0)
		goto out;
		*data = kzalloc(block->size, GFP_KERNEL);
		if (!(*data)) {

		if (data && block->data) {
		*data = kmemdup(block->data, block->size, GFP_KERNEL);
		if (!*data) {
		ret = -ENOMEM;
		goto out;
		} else
		memcpy(data, (void *) block->data, block->size);
		}
		}
		}
		out: