Merge remote-tracking branch 'asoc/for-5.11' into asoc-next

[linux-2.6-microblaze.git] / sound / soc / amd / raven / pci-acp3x.c

diff --git a/sound/soc/amd/raven/pci-acp3x.c b/sound/soc/amd/raven/pci-acp3x.c
index 31b797c..8c138e4 100644 (file)
--- a/sound/soc/amd/raven/pci-acp3x.c
+++ b/sound/soc/amd/raven/pci-acp3x.c
@@ -118,6 +118,10 @@ static int snd_acp3x_probe(struct pci_dev *pci,
        int ret, i;
        u32 addr, val;
 
+       /* Raven device detection */
+       if (pci->revision != 0x00)
+               return -ENODEV;
+
        if (pci_enable_device(pci)) {
                dev_err(&pci->dev, "pci_enable_device failed\n");
                return -ENODEV;
@@ -231,9 +235,8 @@ static int snd_acp3x_probe(struct pci_dev *pci,
                }
                break;
        default:
-               dev_err(&pci->dev, "Invalid ACP audio mode : %d\n", val);
-               ret = -ENODEV;
-               goto disable_msi;
+               dev_info(&pci->dev, "ACP audio mode : %d\n", val);
+               break;
        }
        pm_runtime_set_autosuspend_delay(&pci->dev, 2000);
        pm_runtime_use_autosuspend(&pci->dev);