Skip to content

Revert "ASoC: SOF: ipc4-topology: Always validate the input audio for… #5551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ujfalusi merged 1 commit into from
Oct 7, 2025
Merged

Revert "ASoC: SOF: ipc4-topology: Always validate the input audio for… #5551

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions sound/soc/sof/ipc4-topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1577,6 +1577,7 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
u32 channels;
u32 rate;
u32 type;
bool single_format;
int sample_valid_bits;
int sample_type;
int i = 0;
Expand All @@ -1586,6 +1587,10 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
return -EINVAL;
}

single_format = sof_ipc4_is_single_format(sdev, pin_fmts, pin_fmts_size);
if (single_format)
goto in_fmt;

sample_valid_bits = sof_ipc4_get_valid_bits(sdev, params);
if (sample_valid_bits < 0)
return sample_valid_bits;
Expand All @@ -1610,15 +1615,16 @@ static int sof_ipc4_init_input_audio_fmt(struct snd_sof_dev *sdev,
type = sof_ipc4_fmt_cfg_to_type(fmt->fmt_cfg);
if (params_rate(params) == rate && params_channels(params) == channels &&
sample_valid_bits == valid_bits && sample_type == type)
goto in_fmt;
break;
}

dev_err(sdev->dev,
"%s: Unsupported audio format: %uHz, %ubit, %u channels, type: %d\n",
__func__, params_rate(params), sample_valid_bits,
params_channels(params), sample_type);

return -EINVAL;
if (i == pin_fmts_size) {
dev_err(sdev->dev,
"%s: Unsupported audio format: %uHz, %ubit, %u channels, type: %d\n",
__func__, params_rate(params), sample_valid_bits,
params_channels(params), sample_type);
return -EINVAL;
}

in_fmt:
/* copy input format */
Expand Down
Loading