From patchwork Sat May 1 13:05:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 96168 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o41D6IKU032428 for ; Sat, 1 May 2010 13:06:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752617Ab0EANGQ (ORCPT ); Sat, 1 May 2010 09:06:16 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=tvA44jDLT5SHzIkAhMZhNmgYcJ5JamFM3RneBkhDU6A=; b=OJnMjgWz0oGIQOd0MIi/hIw73pgLUG0TK1Kifx704upaX81tBTakmdIQxyBn8S+D5p lA7lDauF5tRbIVUbEaRpVA+hQh0H/6QxM7sXFrLLEawJa/l0grVAraNIJ1W7rKAaLi58 Qb3dX1innN7ZzxNj838auiBCdOq6U9JDZ39KU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=LOgwVVc3LnDtz7Bs5O7JZAp8Cl/1YqO57jOZ1SpbnqPzPMVm/pY/u7b+Hs6EjFZvuV ShO8Qo5Hv7nGyqoRAvuhdjLUksJAu+W9xm8QKOiqg71V0m2mRDy8OkvNldl3lRBQ7kzs imBTMAZaqfS/SElcSQALtV8yQi8h1b5OqEK3E= Received: by 10.216.90.20 with SMTP id d20mr2245764wef.75.1272719172361; Sat, 01 May 2010 06:06:12 -0700 (PDT) Received: from borken (5e082bba.bb.sky.com [94.8.43.186]) by mx.google.com with ESMTPS id x14sm24248728wbs.0.2010.05.01.06.06.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 01 May 2010 06:06:12 -0700 (PDT) Received: by borken (sSMTP sendmail emulation); Sat, 01 May 2010 14:06:10 +0100 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> X-Mailer: git-send-email 1.6.4.4 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 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]); Sat, 01 May 2010 13:06:19 +0000 (UTC) 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 */