Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps.

[sfrench/cifs-2.6.git] / sound / soc / intel / skylake / skl.c

diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index e7fd14daeb4fe318b04bb63715847543989acd6c..29225623b4b40d1c8fea6822b85b007e57aba690 100644 (file)
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -908,11 +908,15 @@ static int skl_first_init(struct hdac_bus *bus)
                return -ENXIO;
        }
 
-       skl_init_chip(bus, true);
+       snd_hdac_bus_reset_link(bus, true);
 
        snd_hdac_bus_parse_capabilities(bus);
 
+       if (skl_acquire_irq(bus, 0) < 0)
+               return -EBUSY;
+
        pci_set_master(pci);
+       synchronize_irq(bus->irq);
 
        gcap = snd_hdac_chip_readw(bus, GCAP);
        dev_dbg(bus->dev, "chipset global capabilities = 0x%x\n", gcap);
@@ -945,12 +949,6 @@ static int skl_first_init(struct hdac_bus *bus)
        if (err < 0)
                return err;
 
-       err = skl_acquire_irq(bus, 0);
-       if (err < 0)
-               return err;
-
-       synchronize_irq(bus->irq);
-
        /* initialize chip */
        skl_init_pci(skl);