Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions src/audio/pipeline.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,23 +336,18 @@ int pipeline_params(struct pipeline *p, struct comp_dev *host,
{
struct pipeline_data data;
int ret;
uint32_t flags;

trace_pipe_with_ids(p, "pipeline_params()");

data.params = params;
data.start = host;

irq_local_disable(flags);

ret = pipeline_comp_params(host, &data, host->params.direction);
if (ret < 0) {
trace_pipe_error("pipeline_params() error: ret = %d, host->"
"comp.id = %u", ret, host->comp.id);
}

irq_local_enable(flags);

return ret;
}

Expand Down Expand Up @@ -400,19 +395,16 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev)
{
struct pipeline_data ppl_data;
int ret = 0;
uint32_t flags;

trace_pipe_with_ids(p, "pipeline_prepare()");

ppl_data.start = dev;

irq_local_disable(flags);

ret = pipeline_comp_prepare(dev, &ppl_data, dev->params.direction);
if (ret < 0) {
trace_pipe_error("pipeline_prepare() error: ret = %d,"
"dev->comp.id = %u", ret, dev->comp.id);
goto out;
return ret;
}

/* pipeline preload needed only for playback streams without active
Expand All @@ -422,8 +414,6 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev)
p->sink_comp->state != COMP_STATE_ACTIVE;
p->status = COMP_STATE_PREPARE;

out:
irq_local_enable(flags);
Comment thread
tlauda marked this conversation as resolved.
Outdated
return ret;
}

Expand Down