From: David Kilroy <kilroyd@googlemail.com>
To: linux-wireless@vger.kernel.org
Cc: orinoco-devel@lists.sourceforge.net, linville@tuxdriver.com,
David Kilroy <kilroyd@googlemail.com>
Subject: [PATCH 5/6] orinoco_usb: avoid in_atomic
Date: Sat, 1 May 2010 14:05:42 +0100 [thread overview]
Message-ID: <1272719143-26171-6-git-send-email-kilroyd@googlemail.com> (raw)
In-Reply-To: <1272719143-26171-1-git-send-email-kilroyd@googlemail.com>
We expect to be either in process contect or soft interrupt context. So
use in_softirq instead.
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
---
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
next prev parent reply other threads:[~2010-05-01 13:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-01 13:05 [PATCH 0/6] orinoco: Add support for Agere based USB cards David Kilroy
2010-05-01 13:05 ` [PATCH 1/6] orinoco: add hermes_ops David Kilroy
2010-05-01 13:05 ` [PATCH 2/6] orinoco: allow driver to specify netdev_ops David Kilroy
2010-05-01 13:05 ` [PATCH 3/6] orinoco: encapsulate driver locking David Kilroy
2010-05-01 13:05 ` [PATCH 4/6] orinoco: add orinoco_usb driver David Kilroy
2010-05-01 13:05 ` David Kilroy [this message]
2010-05-01 13:05 ` [PATCH 6/6] orinoco_usb: implement fw download David Kilroy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1272719143-26171-6-git-send-email-kilroyd@googlemail.com \
--to=kilroyd@googlemail.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=orinoco-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox