diff options
| author | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-18 10:30:14 -0700 |
| commit | 90fbeb0cabf75e7ab04f4a13a237cd8ccb4544d9 (patch) | |
| tree | f8d540943df9eaaba2001bcaa257624074d89441 /sound/soc/intel/skylake | |
| parent | bf0fa00fd8410b377a3403adb58e32fc703e86e8 (diff) | |
| parent | 3f24f37adbc9a1059420a9c8f857e3490a4bce5e (diff) | |
Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps.
Diffstat (limited to 'sound/soc/intel/skylake')
| -rw-r--r-- | sound/soc/intel/skylake/skl.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index e7fd14daeb4f..29225623b4b4 100644 --- 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); |