xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2018-09-18 10:30:14 -07:00
parent bf0fa00fd8 3f24f37adb
commit 90fbeb0cab
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/intel/skylake/skl.c
View File

@@ -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);