diff options
| author | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-11-29 12:55:51 +0000 |
| commit | aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64 (patch) | |
| tree | 3d80758082c0a3bc293761cc1a4cbac2e457b128 /sound/soc/sof/topology.c | |
| parent | 863b9179cee4570e5da4206dcf8dbcdcc37c8348 (diff) | |
| parent | 3d1bb6cc1a654c8693a85b1d262e610196edec8b (diff) | |
| download | linux-stable-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.gz linux-stable-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.tar.bz2 linux-stable-aeb2e9c4eedc6fed264a51ca2ea17c83984d2a64.zip | |
ASoC: Merge up fixes
Merge the fixes branch up so we can apply further AMD work.
Diffstat (limited to 'sound/soc/sof/topology.c')
| -rw-r--r-- | sound/soc/sof/topology.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 176f64a86c26..9d9fcaa2a948 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1499,16 +1499,6 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, break; } - if (sof_debug_check_flag(SOF_DBG_DISABLE_MULTICORE)) { - swidget->core = SOF_DSP_PRIMARY_CORE; - } else { - int core = sof_get_token_value(SOF_TKN_COMP_CORE_ID, swidget->tuples, - swidget->num_tuples); - - if (core >= 0) - swidget->core = core; - } - /* check token parsing reply */ if (ret < 0) { dev_err(scomp->dev, @@ -1520,6 +1510,16 @@ static int sof_widget_ready(struct snd_soc_component *scomp, int index, return ret; } + if (sof_debug_check_flag(SOF_DBG_DISABLE_MULTICORE)) { + swidget->core = SOF_DSP_PRIMARY_CORE; + } else { + int core = sof_get_token_value(SOF_TKN_COMP_CORE_ID, swidget->tuples, + swidget->num_tuples); + + if (core >= 0) + swidget->core = core; + } + /* bind widget to external event */ if (tw->event_type) { if (widget_ops[w->id].bind_event) { |