From: David Kilroy Date: Sat, 1 May 2010 13:05:42 +0000 (+0100) Subject: orinoco_usb: avoid in_atomic X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc97431a50962e66c052ec6909d4b2582efd3554;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index ce0069de5c46..8e1b31cbd375 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 */