diff options
| author | Curtis Malainey <cujomalainey@chromium.org> | 2023-04-19 14:55:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-04-20 12:51:48 +0100 |
| commit | 058924644f9596b8c55fc81f01f741d628eed940 (patch) | |
| tree | f4ed99d86c80838546fafe867d7f91644bfd240f /sound/soc | |
| parent | 09cda705860125ffee1b1359b1da79f8e0c77a40 (diff) | |
| download | linux-stable-058924644f9596b8c55fc81f01f741d628eed940.tar.gz linux-stable-058924644f9596b8c55fc81f01f741d628eed940.tar.bz2 linux-stable-058924644f9596b8c55fc81f01f741d628eed940.zip | |
ASoC: Intel: sof_cirrus_common: Guard against missing buses
Even if we find a acpi device we can still be missing the physical node.
Signed-off-by: Curtis Malainey <cujomalainey@chromium.org>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230419195524.46995-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/intel/boards/sof_cirrus_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/sof_cirrus_common.c b/sound/soc/intel/boards/sof_cirrus_common.c index 851c516c8f5b..8b8b07e4f2fe 100644 --- a/sound/soc/intel/boards/sof_cirrus_common.c +++ b/sound/soc/intel/boards/sof_cirrus_common.c @@ -168,11 +168,16 @@ static int cs35l41_compute_codec_conf(void) continue; } physdev = get_device(acpi_get_first_physical_node(adev)); + acpi_dev_put(adev); + if (!physdev) { + pr_devel("Cannot find physical node for HID %s UID %u (%s)\n", CS35L41_HID, + uid, cs35l41_name_prefixes[uid]); + return 0; + } cs35l41_components[sz].name = dev_name(physdev); cs35l41_components[sz].dai_name = CS35L41_CODEC_DAI; cs35l41_codec_conf[sz].dlc.name = dev_name(physdev); cs35l41_codec_conf[sz].name_prefix = cs35l41_name_prefixes[uid]; - acpi_dev_put(adev); sz++; } |