diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-26 13:45:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-26 13:45:53 +0100 |
| commit | 49951ae308e2d552839a930599163cb10ea423c2 (patch) | |
| tree | a4b7216006950e917dacc421fb6c063e3292ab28 /sound/soc/sof/sof-acpi-dev.c | |
| parent | c5b5ff607d6fe5f4284acabd07066f96ecf96ac4 (diff) | |
| parent | 5413dfd8ce0d5d997d442440701814a8ce7025d9 (diff) | |
| download | linux-49951ae308e2d552839a930599163cb10ea423c2.tar.gz | |
Merge tag 'asoc-fix-v5.11-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11 More fixes for v5.11, almost all driver specific issues including new device IDs - there's one error handling fix for the topology stuff too.
Diffstat (limited to 'sound/soc/sof/sof-acpi-dev.c')
| -rw-r--r-- | sound/soc/sof/sof-acpi-dev.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c index 2a369c2c6551..cc2e257087e4 100644 --- a/sound/soc/sof/sof-acpi-dev.c +++ b/sound/soc/sof/sof-acpi-dev.c @@ -131,12 +131,13 @@ static int sof_acpi_probe(struct platform_device *pdev) if (!id) return -ENODEV; - ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { - dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); - return -ENODEV; + if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) { + ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); + if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { + dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); + return -ENODEV; + } } - dev_dbg(dev, "ACPI DSP detected"); sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL); |