diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-05 15:01:21 +0000 |
| commit | 2927e6d398d0fca52d8f011a89dcfcabb2b1abfd (patch) | |
| tree | 30ddd4cddded855db423c290512d7be7c13dc9db /sound/soc/sof/sof-pci-dev.c | |
| parent | 6395a6213b8367bb55c3b940f663eda772d7c19c (diff) | |
| parent | b976a5adf32eee7db928b5b77cffa3b008ebf2ff (diff) | |
Merge branch 'asoc-5.11' into asoc-5.12
Diffstat (limited to 'sound/soc/sof/sof-pci-dev.c')
| -rw-r--r-- | sound/soc/sof/sof-pci-dev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 7757463bd81a..388772f9c4d2 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -346,10 +346,12 @@ static int sof_pci_probe(struct pci_dev *pci, const struct snd_sof_dsp_ops *ops; int ret; - ret = snd_intel_dsp_driver_probe(pci); - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { - dev_dbg(&pci->dev, "SOF PCI driver not selected, aborting probe\n"); - return -ENODEV; + if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) { + ret = snd_intel_dsp_driver_probe(pci); + if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { + dev_dbg(&pci->dev, "SOF PCI driver not selected, aborting probe\n"); + return -ENODEV; + } } dev_dbg(&pci->dev, "PCI DSP detected"); |