[PATCH 1/2] ASoC: Intel: avs: Synchronize happy and error paths in PCI probe

[Cezary Rojewski <cezary.rojewski@intel.com>]

Error path in avs_pci_probe() does not match its happy path.

Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
---
 sound/soc/intel/avs/core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 7af324753673..5ea42b5af26f 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -505,11 +505,11 @@ 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);
+	pci_clear_master(pci);
+	pci_free_irq(pci, 0, adev);
+	pci_free_irq(pci, 0, bus);
+	pci_free_irq_vectors(pci);
 err_acquire_irq:
 	snd_hdac_bus_free_stream_pages(bus);
 	snd_hdac_ext_stream_free_all(bus);
-- 
2.25.1