diff options
| author | Mark Brown <broonie@kernel.org> | 2024-04-30 00:15:57 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-04-30 00:15:57 +0900 |
| commit | 9b4f41684b239eedac96913270db4a5669956671 (patch) | |
| tree | cb9b4800c3d6b93bc4af31fa3e377933c68f9bb2 /sound/soc/intel/avs | |
| parent | 2da01ca3674c6e90dbeeda02168849e2ec877edc (diff) | |
| parent | bda16500dd0b05e2e047093b36cbe0873c95aeae (diff) | |
ASoC: Merge up fixes
Some new SOF changes depend on the fixes there.
Diffstat (limited to 'sound/soc/intel/avs')
| -rw-r--r-- | sound/soc/intel/avs/icl.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/avs/topology.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/avs/icl.c b/sound/soc/intel/avs/icl.c index e0880acf8050..3a96c4304ca6 100644 --- a/sound/soc/intel/avs/icl.c +++ b/sound/soc/intel/avs/icl.c @@ -66,7 +66,7 @@ static_assert(sizeof(struct avs_icl_memwnd2_desc) == 12); struct avs_icl_memwnd2 { union { struct avs_icl_memwnd2_desc slot_desc[AVS_ICL_MEMWND2_SLOTS_COUNT]; - u8 rsvd[PAGE_SIZE]; + u8 rsvd[SZ_4K]; }; u8 slot_array[AVS_ICL_MEMWND2_SLOTS_COUNT][SZ_4K]; } __packed; diff --git a/sound/soc/intel/avs/topology.c b/sound/soc/intel/avs/topology.c index 13061bd1488b..42b42903ae9d 100644 --- a/sound/soc/intel/avs/topology.c +++ b/sound/soc/intel/avs/topology.c @@ -1582,6 +1582,8 @@ static int avs_widget_load(struct snd_soc_component *comp, int index, if (!le32_to_cpu(dw->priv.size)) return 0; + w->no_wname_in_kcontrol_name = true; + if (w->ignore_suspend && !AVS_S0IX_SUPPORTED) { dev_info_once(comp->dev, "Device does not support S0IX, check BIOS settings\n"); w->ignore_suspend = false; |