From patchwork Mon Apr 19 07:35:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave X-Patchwork-Id: 93431 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 o3J7a2Jj025324 for ; Mon, 19 Apr 2010 07:37:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752228Ab0DSHf7 (ORCPT ); Mon, 19 Apr 2010 03:35:59 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:34487 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752163Ab0DSHf6 (ORCPT ); Mon, 19 Apr 2010 03:35:58 -0400 Received: by mail-wy0-f174.google.com with SMTP id 39so2304576wyb.19 for ; Mon, 19 Apr 2010 00:35:58 -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=q2BL5lxwA5UTI+neexBrBhgCo/udUVOq0PyICK1jA74=; b=FyKJc3b6OsSaJkvA2uLsT3BBbt8ZQsrWtqFbaSiEfqWW0pfipLz+kD7u+yGA04U52/ Ax0ZlxKFOnC5q4l2Y5MQNztVIEhd5+TAd6UPyfYbX1IDxrmw4RzyAiVU2f3Yt5xa3YYe nxCP1kAJszhqP88t6DlN45O+N0VrDXa24uyq0= 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=RnX/7J0SS+c2QftqINxXOrw6XLITrIVQTto6MPlU4Cs6L/1SAsRvp0Iu0f2hutFHR2 JXztSqcpTTq0zXiwlFpwCIYuQ/a1HPbAXbRcoedZvj6auLcQKBJMDm63ublNzIXrHOVo 0Kwab6vadZQoLfbdoq5kSgjIV6NiJQxd58H4I= Received: by 10.216.168.203 with SMTP id k53mr6134807wel.120.1271662557805; Mon, 19 Apr 2010 00:35:57 -0700 (PDT) Received: from borken (5e01228a.bb.sky.com [94.1.34.138]) by mx.google.com with ESMTPS id z34sm46546791wbv.2.2010.04.19.00.35.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 19 Apr 2010 00:35:57 -0700 (PDT) Received: by borken (sSMTP sendmail emulation); Mon, 19 Apr 2010 08:35:58 +0100 From: David Kilroy To: linux-wireless@vger.kernel.org Cc: orinoco-devel@lists.sourceforge.net, David Kilroy Subject: [RFC 5/5] orinoco_usb: avoid in_atomic Date: Mon, 19 Apr 2010 08:35:22 +0100 Message-Id: <1271662522-29119-6-git-send-email-kilroyd@googlemail.com> X-Mailer: git-send-email 1.6.4.4 In-Reply-To: <1271662522-29119-1-git-send-email-kilroyd@googlemail.com> References: <1271662522-29119-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]); Mon, 19 Apr 2010 07:37:10 +0000 (UTC) diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index eaec04e..1abc303 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 */