diff options
| author | Cezary Rojewski <cezary.rojewski@intel.com> | 2024-02-02 12:49:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-02-05 15:31:36 +0100 |
| commit | b5fbde22684af5456d1de60758950944d69d69ad (patch) | |
| tree | a77ad6dc483701617d26dc42bcacf2680f64fb8c /sound | |
| parent | ASoC: dt-bindings: google,sc7280-herobrine: Drop bouncing @codeaurora (diff) | |
| download | linux-b5fbde22684af5456d1de60758950944d69d69ad.tar.xz linux-b5fbde22684af5456d1de60758950944d69d69ad.zip | |
ASoC: Intel: avs: Fix pci_probe() error path
Recent changes modified operation-order in the probe() function without
updating its error path accordingly. If snd_hdac_i915_init() exists with
status EPROBE_DEFER the error path must cleanup allocated IRQs before
leaving the scope.
Fixes: 2dddc514b6e4 ("ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work.")
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20240202114901.1002127-1-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/avs/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index 59c3793f65df..db78eb2f0108 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -477,6 +477,9 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) return 0; err_i915_init: + pci_free_irq(pci, 0, adev); + pci_free_irq(pci, 0, bus); + pci_free_irq_vectors(pci); pci_clear_master(pci); pci_set_drvdata(pci, NULL); err_acquire_irq: |