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>

diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index ce0069de5c46a0e016ce6cd68a55c2e7a79e9756..8e1b31cbd375605e262b9425431dcf3c193ea530 100644 (file)
--- 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 */