diff options
author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2019-06-06 07:22:22 -0400 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2019-06-06 13:16:04 -0400 |
commit | 9315d904c7e8f38886e2820fa6cb8d0fa723ea21 (patch) | |
tree | 509d658282923655b5c91c2f598e4e7d9274f965 | |
parent | 03ecad90d3798be11b033248bbd4bbff4425a1c7 (diff) |
soundwire: stream: fix bad unlock balance
the msg lock is taken for multi-link cases only but released
unconditionally, leading to an unlock balance warning for single-link usages
This patch fixes this.
=====================================
WARNING: bad unlock balance detected!
5.1.0-16506-gc1c383a6f0a2-dirty #1523 Tainted: G W
-------------------------------------
aplay/2954 is trying to release lock (&bus->msg_lock) at:
do_bank_switch+0x21c/0x480
but there are no more locks to release!
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: Sanyog Kale <sanyog.r.kale@intel.com>
[vkoul: edited the change log as suggested by Pierre]
Signed-off-by: Vinod Koul <vkoul@kernel.org>
-rw-r--r-- | drivers/soundwire/stream.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 544925ff0b40..1d5294b8783b 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c | |||
@@ -814,7 +814,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) | |||
814 | goto error; | 814 | goto error; |
815 | } | 815 | } |
816 | 816 | ||
817 | mutex_unlock(&bus->msg_lock); | 817 | if (bus->multi_link) |
818 | mutex_unlock(&bus->msg_lock); | ||
818 | } | 819 | } |
819 | 820 | ||
820 | return ret; | 821 | return ret; |