Skip to content

Commit

Permalink
ASoC: SOF: append extended data to sof_ipc_comp_mux
Browse files Browse the repository at this point in the history
Append the extended data to the end of the struct sof_ipc_comp_mux,
construct the ipc for COMP_NEW during the topology load stage.

Signed-off-by: Keyon Jie <yang.jie@linux.intel.com>
  • Loading branch information
keyonjie authored and kv2019i committed Aug 13, 2020
1 parent a9a4e95 commit 355c0de
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions sound/soc/sof/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -1817,19 +1817,16 @@ static int sof_widget_load_mux(struct snd_soc_component *scomp, int index,
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
struct snd_soc_tplg_private *private = &tw->priv;
struct sof_ipc_comp_mux *mux;
size_t ipc_size = sizeof(*mux);
int ret;

mux = kzalloc(sizeof(*mux), GFP_KERNEL);
mux = (struct sof_ipc_comp_mux *)
sof_comp_alloc(swidget, &ipc_size, index, core);
if (!mux)
return -ENOMEM;

/* configure mux IPC message */
mux->comp.hdr.size = sizeof(*mux);
mux->comp.hdr.cmd = SOF_IPC_GLB_TPLG_MSG | SOF_IPC_TPLG_COMP_NEW;
mux->comp.id = swidget->comp_id;
mux->comp.type = SOF_COMP_MUX;
mux->comp.pipeline_id = index;
mux->comp.core = core;
mux->config.hdr.size = sizeof(mux->config);

ret = sof_parse_tokens(scomp, &mux->config, comp_tokens,
Expand All @@ -1847,7 +1844,7 @@ static int sof_widget_load_mux(struct snd_soc_component *scomp, int index,
swidget->private = mux;

ret = sof_ipc_tx_message(sdev->ipc, mux->comp.hdr.cmd, mux,
sizeof(*mux), r, sizeof(*r));
ipc_size, r, sizeof(*r));
if (ret < 0)
kfree(mux);

Expand Down

0 comments on commit 355c0de

Please sign in to comment.