Return-path: Received: from mail-wy0-f174.google.com ([74.125.82.174]:53625 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557Ab0EANGN (ORCPT ); Sat, 1 May 2010 09:06:13 -0400 Received: by wye20 with SMTP id 20so765670wye.19 for ; Sat, 01 May 2010 06:06:12 -0700 (PDT) From: David Kilroy To: linux-wireless@vger.kernel.org Cc: orinoco-devel@lists.sourceforge.net, linville@tuxdriver.com, David Kilroy Subject: [PATCH 5/6] orinoco_usb: avoid in_atomic Date: Sat, 1 May 2010 14:05:42 +0100 Message-Id: <1272719143-26171-6-git-send-email-kilroyd@googlemail.com> In-Reply-To: <1272719143-26171-1-git-send-email-kilroyd@googlemail.com> References: <1272719143-26171-1-git-send-email-kilroyd@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org List-ID: We expect to be either in process contect or soft interrupt context. So use in_softirq instead. Signed-off-by: David Kilroy --- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index ce0069d..8e1b31c 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -701,7 +701,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv, case EZUSB_CTX_REQ_SUBMITTED: case EZUSB_CTX_REQ_COMPLETE: case EZUSB_CTX_RESP_RECEIVED: - if (in_atomic()) { + if (in_softirq()) { /* If we get called from a timer, timeout timers don't * get the chance to run themselves. So we make sure * that we don't sleep for ever */ -- 1.6.4.4