OSDN Git Service

ASoC: SOF: sof-pci-dev: fix missing pci_release_regions() on error in sof_pci_probe()
authorYang Yingliang <yangyingliang@huawei.com>
Tue, 26 Apr 2022 13:25:39 +0000 (21:25 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 29 Apr 2022 12:06:19 +0000 (13:06 +0100)
Fix the missing pci_release_regions() before return
from sof_pci_probe() in the error handling case.

Fixes: 4bfbbb76e82e ("ASOC: SOF: pci: add ipc_type override for Intel IPC4 tests")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220426132539.416676-1-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sof/sof-pci-dev.c

index cd90da7..3b0978b 100644 (file)
@@ -217,12 +217,14 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
                         desc->ipc_default, sof_pci_ipc_type);
                if (sof_pci_ipc_type >= SOF_IPC_TYPE_COUNT) {
                        dev_err(dev, "invalid request value %d\n", sof_pci_ipc_type);
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto out;
                }
                if (!(BIT(sof_pci_ipc_type) & desc->ipc_supported_mask)) {
                        dev_err(dev, "invalid request value %d, supported mask is %#x\n",
                                sof_pci_ipc_type, desc->ipc_supported_mask);
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto out;
                }
                sof_pdata->ipc_type = sof_pci_ipc_type;
        }
@@ -291,6 +293,8 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
 
        /* call sof helper for DSP hardware probe */
        ret = snd_sof_device_probe(dev, sof_pdata);
+
+out:
        if (ret)
                pci_release_regions(pci);