diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-05-23 07:48:16 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-05-23 07:48:27 +0200 |
| commit | 1212fa1b482ea09c19aed29001465799e85ea6c3 (patch) | |
| tree | ca70b299e420fbbfab8cb9780584f66b0652f8a8 /sound/soc/sof/sof-pci-dev.c | |
| parent | 03a8b0df757f1beb21ba1626e23ca7412e48b525 (diff) | |
| parent | 7b0efea4baf02f5e2f89e5f9b75ef891571b45f1 (diff) | |
| download | lwn-1212fa1b482ea09c19aed29001465799e85ea6c3.tar.gz lwn-1212fa1b482ea09c19aed29001465799e85ea6c3.zip | |
Merge branch 'for-linus' into for-next
Merge for 5.18-rc1
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sof/sof-pci-dev.c')
| -rw-r--r-- | sound/soc/sof/sof-pci-dev.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 4c9596742844..7fa2649e56e5 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -83,7 +83,14 @@ static const struct dmi_system_id sof_tplg_table[] = { }, .driver_data = "sof-adl-max98357a-rt5682-2way.tplg", }, - + { + .callback = sof_tplg_cb, + .matches = { + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Brya"), + DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S_AMP_SSP2"), + }, + .driver_data = "sof-adl-max98357a-rt5682.tplg", + }, {} }; @@ -146,6 +153,11 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) dev_dbg(&pci->dev, "PCI DSP detected"); + if (!desc) { + dev_err(dev, "error: no matching PCI descriptor\n"); + return -ENODEV; + } + if (!desc->ops) { dev_err(dev, "error: no matching PCI descriptor ops\n"); return -ENODEV; |