diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-06 14:01:11 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-06 14:01:11 +0200 |
| commit | 8df22a4d6f5b81c9c1703579d4907b57002689ed (patch) | |
| tree | 064e9662d427a82076e1151fcd9aa78a1066f9f4 /kernel/futex.c | |
| parent | ALSA: ctxfi: pr_* replaced with dev_* (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'as... (diff) | |
| download | linux-8df22a4d6f5b81c9c1703579d4907b57002689ed.tar.xz linux-8df22a4d6f5b81c9c1703579d4907b57002689ed.zip | |
Merge tag 'asoc-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.18
- More componentisation work from Lars-Peter, this time mainly
cleaning up the suspend and bias level transition callbacks.
- Real system support for the Intel drivers and a bunch of fixes and
enhancements for the associated CODEC drivers, this is going to need
a lot quirks over time due to the lack of any firmware description of
the boards.
- Jack detect support for simple card from Dylan Reid.
- A bunch of small fixes and enhancements for the Freescale drivers.
- New drivers for Analog Devices SSM4567, Cirrus Logic CS35L32, Everest
Semiconductor ES8328 and Freescale cards using the ASRC in newer i.MX
processors.
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index d3a9d946d0b7..815d7af2ffe8 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2592,6 +2592,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, * shared futexes. We need to compare the keys: */ if (match_futex(&q.key, &key2)) { + queue_unlock(hb); ret = -EINVAL; goto out_put_keys; } |