diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-17 21:52:26 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-17 21:52:26 +0300 |
| commit | 0969db0d8d15caee41cd817154670c38d9ed7f61 (patch) | |
| tree | 8ff546a65226e934d2b975ead545bb8bae54affc /sound/soc/sof/topology.c | |
| parent | 3b9b1490e098f4847a215d2be6a66fbb891bfc7a (diff) | |
| parent | 7d25f7ca110e3e1433d3e6b53f4937fdabe42aa7 (diff) | |
| download | linux-0969db0d8d15caee41cd817154670c38d9ed7f61.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.12' into asoc-linus
Diffstat (limited to 'sound/soc/sof/topology.c')
| -rw-r--r-- | sound/soc/sof/topology.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 480cf75a7575..10f99620eb31 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1352,10 +1352,6 @@ static int sof_core_enable(struct snd_sof_dev *sdev, int core) core, ret); goto err; } - - /* update enabled cores mask */ - sdev->enabled_cores_mask |= BIT(core); - return ret; err: /* power down core if it is host managed and return the original error if this fails too */ @@ -2603,10 +2599,6 @@ static int sof_widget_unload(struct snd_soc_component *scomp, if (ret < 0) dev_err(scomp->dev, "error: powering down pipeline schedule core %d\n", pipeline->core); - - /* update enabled cores mask */ - sdev->enabled_cores_mask &= ~(1 << pipeline->core); - break; default: break; @@ -3666,7 +3658,7 @@ static int sof_manifest(struct snd_soc_component *scomp, int index, return -EINVAL; } - if (abi_version > SOF_ABI_VERSION) { + if (SOF_ABI_VERSION_MINOR(abi_version) > SOF_ABI_MINOR) { if (!IS_ENABLED(CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS)) { dev_warn(scomp->dev, "warn: topology ABI is more recent than kernel\n"); } else { |