[PATCH 32/50] wireless: ath: carl9170: spin_lock in complete() cleanup
From: Ming Lei <hidden>
Date: 2013-07-11 09:10:54
Also in:
alsa-devel, linux-input, linux-media, linux-wireless
Subsystem:
atheros ath generic utilities, carl9170 linux community wireless driver, the rest · Maintainers:
Jeff Johnson, Christian Lamparter, Linus Torvalds
Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). Cc: Christian Lamparter <chunkeey@googlemail.com> Cc: "John W. Linville" <redacted> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Ming Lei <redacted> --- drivers/net/wireless/ath/carl9170/rx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c
index 4684dd9..61f62a6 100644
--- a/drivers/net/wireless/ath/carl9170/rx.c
+++ b/drivers/net/wireless/ath/carl9170/rx.c@@ -129,6 +129,7 @@ static int carl9170_check_sequence(struct ar9170 *ar, unsigned int seq) static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer) { + unsigned long flags; /* * Some commands may have a variable response length * and we cannot predict the correct length in advance.
@@ -148,7 +149,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer) carl9170_restart(ar, CARL9170_RR_INVALID_RSP); } - spin_lock(&ar->cmd_lock); + spin_lock_irqsave(&ar->cmd_lock, flags); if (ar->readbuf) { if (len >= 4) memcpy(ar->readbuf, buffer + 4, len - 4);
@@ -156,7 +157,7 @@ static void carl9170_cmd_callback(struct ar9170 *ar, u32 len, void *buffer) ar->readbuf = NULL; } complete(&ar->cmd_wait); - spin_unlock(&ar->cmd_lock); + spin_unlock_irqrestore(&ar->cmd_lock, flags); } void carl9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len)
--
1.7.9.5