From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pb0-f46.google.com ([209.85.160.46]:47245 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018Ab3HQQaw (ORCPT ); Sat, 17 Aug 2013 12:30:52 -0400 From: Ming Lei To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, Oliver Neukum , Alan Stern , Ming Lei , Christian Lamparter , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v1 34/49] wireless: ath: carl9170: prepare for enabling irq in complete() Date: Sun, 18 Aug 2013 00:24:59 +0800 Message-Id: <1376756714-25479-35-git-send-email-ming.lei@canonical.com> (sfid-20130817_183058_763390_897D7B8E) In-Reply-To: <1376756714-25479-1-git-send-email-ming.lei@canonical.com> References: <1376756714-25479-1-git-send-email-ming.lei@canonical.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: Complete() will be run with interrupt enabled, so change to spin_lock_irqsave(). Cc: Christian Lamparter Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Ming Lei --- 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