aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/orinoco
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2010-05-01 14:05:42 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-05-03 14:53:08 -0400
commitfc97431a50962e66c052ec6909d4b2582efd3554 (patch)
treec25d95dad853cb8a6e0ec3275ca3b0c7c09bb34e /drivers/net/wireless/orinoco
parent9afac70a7305817b22327ac23cf2d0eb72388229 (diff)
orinoco_usb: avoid in_atomic
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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco')
-rw-r--r--drivers/net/wireless/orinoco/orinoco_usb.c2
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 ce0069de5c4..8e1b31cbd37 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 */