orinoco_usb: avoid in_atomic
authorDavid Kilroy <kilroyd@googlemail.com>
Sat, 1 May 2010 13:05:42 +0000 (14:05 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 3 May 2010 18:53:08 +0000 (14:53 -0400)
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>
drivers/net/wireless/orinoco/orinoco_usb.c

index ce0069d..8e1b31c 100644 (file)
@@ -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 */