Skip to content

Commit 2e09d08

Browse files
bardliaoplbossart
authored andcommitted
fixup! ASoC: SOF: IPC4: add sdw blob
gtw_cfg.config_length can be set in setup. Also, u32 ch_map is always >= 0. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent d6d0d86 commit 2e09d08

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/sof/ipc4-topology.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
487487
}
488488

489489
ipc4_copier->copier_config = (uint32_t *)blob;
490+
ipc4_copier->data.gtw_cfg.config_length = sizeof(*blob) >> 2;
490491
break;
491492
}
492493
case SOF_DAI_INTEL_SSP:
@@ -1085,11 +1086,10 @@ sof_ipc4_prepare_copier_module(struct snd_sof_widget *swidget,
10851086
blob->alh_cfg.count = 1;
10861087
blob->alh_cfg.mapping[0].alh_id = copier_data->gtw_cfg.node_id;
10871088
blob->gw_attr.lp_buffer_alloc = 0;
1088-
copier_data->gtw_cfg.config_length = sizeof(*blob) >> 2;
10891089

10901090
/* Get channel_mask from ch_map */
10911091
ch_map = copier_data->base_config.audio_fmt.ch_map;
1092-
for (i = 0; ch_map > 0; i++) {
1092+
for (i = 0; ch_map; i++) {
10931093
if ((ch_map & 0xf) != 0xf)
10941094
blob->alh_cfg.mapping[0].channel_mask |= BIT(i);
10951095
ch_map >>= 4;

0 commit comments

Comments
 (0)