diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-04-25 17:43:56 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-04-25 17:43:56 +0200 |
commit | d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (patch) | |
tree | efc6288fa8342b1b0c68ba4e71a2c8b7d27b8ea8 /sound/soc/sti/uniperif.h | |
parent | dfb00a56935186171abb5280b3407c3f910011f1 (diff) | |
parent | dc9617cb81c4130858b6dd026039f42a39e93c18 (diff) |
Merge tag 'asoc-fix-v4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.11
ASoC: Fixes for v4.11
A few last minute fixes for v4.11, the STI fix is relatively large but
driver specific and has been cooking in -next for a little while now:
- A fix from Takashi for some suspend/resume related crashes in the
Intel drivers.
- A fix from Mousumi Jana for issues with incorrectly created
enumeration controls generated from topology files which could cause
problems for userspace.
- Fixes from Arnaud Pouliquen for some crashes due to races with the
interrupt handler in the STI driver.
Diffstat (limited to 'sound/soc/sti/uniperif.h')
-rw-r--r-- | sound/soc/sti/uniperif.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sti/uniperif.h b/sound/soc/sti/uniperif.h index d487dd2ef016..cfcb0ea9d99d 100644 --- a/sound/soc/sti/uniperif.h +++ b/sound/soc/sti/uniperif.h @@ -1299,6 +1299,7 @@ struct uniperif { int ver; /* IP version, used by register access macros */ struct regmap_field *clk_sel; struct regmap_field *valid_sel; + spinlock_t irq_lock; /* use to prevent race condition with IRQ */ /* capabilities */ const struct snd_pcm_hardware *hw; |