diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
commit | d083f580e5b940834a93ab741cdf064f0324dc0f (patch) | |
tree | d034075e47d68179d2f8bf7220d26bef0ba740d3 /kernel/locking/mutex-debug.c | |
parent | 931f27c6e892fdfe98896055e0df7962e21969d9 (diff) | |
parent | 13ff50c85846338bb9820abd3933227b678dc086 (diff) |
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API
This is useful for generic code built on top of regmap dealing with
blocks of data.
Diffstat (limited to 'kernel/locking/mutex-debug.c')
-rw-r--r-- | kernel/locking/mutex-debug.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c index 7e3443fe1f4..faf6f5b53e7 100644 --- a/kernel/locking/mutex-debug.c +++ b/kernel/locking/mutex-debug.c @@ -75,7 +75,12 @@ void debug_mutex_unlock(struct mutex *lock) return; DEBUG_LOCKS_WARN_ON(lock->magic != lock); - DEBUG_LOCKS_WARN_ON(lock->owner != current); + + if (!lock->owner) + DEBUG_LOCKS_WARN_ON(!lock->owner); + else + DEBUG_LOCKS_WARN_ON(lock->owner != current); + DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next); mutex_clear_owner(lock); } |