Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc97431a authored May 01, 2010 by David Kilroy Committed by John W. Linville May 03, 2010

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>

parent 9afac70a

drivers/net/wireless/orinoco/orinoco_usb.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */