diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-06-06 21:03:46 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-06-06 21:03:46 +0300 |
| commit | dd8038ec56c18680ddddf948247f53d427054f45 (patch) | |
| tree | 9552d8cd5578bf82e028dd4205b799736f877476 /sound/soc/intel/skylake/skl.h | |
| parent | 4eab0ea196f569ed2085a0fa3729f60eb8edaad1 (diff) | |
| parent | 7327a946a3b921d60d48924d34ac99eae2fae57d (diff) | |
| download | linux-dd8038ec56c18680ddddf948247f53d427054f45.tar.xz | |
Merge tag 'asoc-fix-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.12
This is the usual collection of device specific fixes, all accumilated
since the merge window, plus one fix from Takashi for a nasty use after
free bug that bit some things with deferred probe and an update to the
maintainer address for the former Wolfson parts.
Diffstat (limited to 'sound/soc/intel/skylake/skl.h')
| -rw-r--r-- | sound/soc/intel/skylake/skl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h index a454f6035f3e..2a630fcb7f08 100644 --- a/sound/soc/intel/skylake/skl.h +++ b/sound/soc/intel/skylake/skl.h @@ -46,7 +46,7 @@ struct skl { struct hdac_ext_bus ebus; struct pci_dev *pci; - unsigned int init_failed:1; /* delayed init failed */ + unsigned int init_done:1; /* delayed init status */ struct platform_device *dmic_dev; struct platform_device *i2s_dev; struct snd_soc_platform *platform; @@ -64,6 +64,8 @@ struct skl { const struct firmware *tplg; int supend_active; + + struct work_struct probe_work; }; #define skl_to_ebus(s) (&(s)->ebus) |