From patchwork Tue Aug 17 19:46:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grazvydas Ignotas X-Patchwork-Id: 120008 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7HJlfXj004169 for ; Tue, 17 Aug 2010 19:49:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484Ab0HQTrZ (ORCPT ); Tue, 17 Aug 2010 15:47:25 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:42138 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752361Ab0HQTrX (ORCPT ); Tue, 17 Aug 2010 15:47:23 -0400 Received: by ewy23 with SMTP id 23so3304186ewy.19 for ; Tue, 17 Aug 2010 12:47:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=IM2048fFZJ3l5atqcjP+/+5a2tZrpXVSY5yMTF2eJn0=; b=MjIW6Bu4Nv+6AxOrTDUrwz8zditHhqHCCtgizbq5dhf/a/2L8NejUKuGYW92/9203p 88Sb6XjMcBiz0zRQsB7zSYO8jWHO2DcTtN4HJrWmKoEIfkQpjJtwLywXkCJjDNXAG7dl FN7YxGA2e8z3ObQ/yyBLDzI1xrBMUX5f0y4xI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=Zb5uHbK0XicDTt/2P92Jxr0N563lMWdRU5XCHkCVdGd2Hl4EPV0+Zfeb7MpvqUagsB C2HijaVtn6JdWFlBUocqIB+SPn4Sa6S0L/nNOEbLHTyJVv4Zb76wRAHwENxTLiFZR/dg 0meFZ6Ctih6wVBaUa2+tbX4Bn2cI4aAbVWuD0= Received: by 10.213.14.131 with SMTP id g3mr1197550eba.47.1282074441934; Tue, 17 Aug 2010 12:47:21 -0700 (PDT) Received: from localhost.localdomain (ip-88-119-226-136.static.b4net.lt [88.119.226.136]) by mx.google.com with ESMTPS id v59sm12710731eeh.22.2010.08.17.12.47.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 17 Aug 2010 12:47:21 -0700 (PDT) From: Grazvydas Ignotas To: "John W. Linville" Cc: linux-wireless@vger.kernel.org, Kalle Valo , Grazvydas Ignotas Subject: [PATCH 2/4] wl1251: fix event handling mechanism Date: Tue, 17 Aug 2010 22:46:53 +0300 Message-Id: <1282074415-6168-3-git-send-email-notasas@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1282074415-6168-1-git-send-email-notasas@gmail.com> References: <1282074415-6168-1-git-send-email-notasas@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 17 Aug 2010 19:49:08 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 6d31c85..51474b6 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c @@ -293,14 +293,14 @@ static void wl1251_irq_work(struct work_struct *work) wl1251_tx_complete(wl); } - if (intr & (WL1251_ACX_INTR_EVENT_A | - WL1251_ACX_INTR_EVENT_B)) { - wl1251_debug(DEBUG_IRQ, "WL1251_ACX_INTR_EVENT (0x%x)", - intr); - if (intr & WL1251_ACX_INTR_EVENT_A) - wl1251_event_handle(wl, 0); - else - wl1251_event_handle(wl, 1); + if (intr & WL1251_ACX_INTR_EVENT_A) { + wl1251_debug(DEBUG_IRQ, "WL1251_ACX_INTR_EVENT_A"); + wl1251_event_handle(wl, 0); + } + + if (intr & WL1251_ACX_INTR_EVENT_B) { + wl1251_debug(DEBUG_IRQ, "WL1251_ACX_INTR_EVENT_B"); + wl1251_event_handle(wl, 1); } if (intr & WL1251_ACX_INTR_INIT_COMPLETE)