diff options
| author | Mark Brown <broonie@kernel.org> | 2021-12-01 15:15:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-12-01 15:15:12 +0100 |
| commit | 67140b64b68395b79177efcd16a7530ed5311e49 (patch) | |
| tree | b1843f4e04d9c0f1d749add23f78ed2ddc84e7ed /sound/soc/soc-acpi.c | |
| parent | ASoC: Intel: boards: add max98390 2/4 speakers support (diff) | |
| parent | ASoC: SOF: Intel: Retry codec probing if it fails (diff) | |
| download | linux-67140b64b68395b79177efcd16a7530ed5311e49.tar.xz linux-67140b64b68395b79177efcd16a7530ed5311e49.zip | |
Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.17 so we can apply new Tegra work
Diffstat (limited to 'sound/soc/soc-acpi.c')
| -rw-r--r-- | sound/soc/soc-acpi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/soc-acpi.c b/sound/soc/soc-acpi.c index 2ae99b49d3f5..cbd7ea48837b 100644 --- a/sound/soc/soc-acpi.c +++ b/sound/soc/soc-acpi.c @@ -20,8 +20,10 @@ static bool snd_soc_acpi_id_present(struct snd_soc_acpi_mach *machine) if (comp_ids) { for (i = 0; i < comp_ids->num_codecs; i++) { - if (acpi_dev_present(comp_ids->codecs[i], NULL, -1)) + if (acpi_dev_present(comp_ids->codecs[i], NULL, -1)) { + strscpy(machine->id, comp_ids->codecs[i], ACPI_ID_LEN); return true; + } } } |