mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-10 04:46:40 +07:00
ASoC: Intel: cht_bsw_rt5645: harden ACPI device detection
Fix classic issue of having multiple codecs listed in DSDT but a single one actually enabled. The previous code did not handle such errors and could also lead to uninitalized configurations Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
e1d0691454
commit
42648c2270
@ -407,22 +407,32 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
|
||||
struct sst_acpi_mach *mach;
|
||||
const char *i2c_name = NULL;
|
||||
int dai_index = 0;
|
||||
bool found = false;
|
||||
|
||||
drv = devm_kzalloc(&pdev->dev, sizeof(*drv), GFP_ATOMIC);
|
||||
if (!drv)
|
||||
return -ENOMEM;
|
||||
|
||||
mach = (&pdev->dev)->platform_data;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(snd_soc_cards); i++) {
|
||||
if (acpi_dev_found(snd_soc_cards[i].codec_id)) {
|
||||
if (acpi_dev_found(snd_soc_cards[i].codec_id) &&
|
||||
(!strncmp(snd_soc_cards[i].codec_id, mach->id, 8))) {
|
||||
dev_dbg(&pdev->dev,
|
||||
"found codec %s\n", snd_soc_cards[i].codec_id);
|
||||
card = snd_soc_cards[i].soc_card;
|
||||
drv->acpi_card = &snd_soc_cards[i];
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
dev_err(&pdev->dev, "No matching HID found in supported list\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
card->dev = &pdev->dev;
|
||||
mach = card->dev->platform_data;
|
||||
sprintf(drv->codec_name, "i2c-%s:00", drv->acpi_card->codec_id);
|
||||
|
||||
/* set correct codec name */
|
||||
|
Loading…
Reference in New Issue
Block a user