Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1221386

[PATCH v1 8/8] orinoco_usb: Fix fallout of wait to swait completion change

Show all headers | View raw

The completion code has been changed using swait (simple wait) instead
of the more complex wait implementation. ezusb_req_ctx_wait() is using
not using the wait_for_completation_*() helper function we need to
update this function accordingly.

Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Joe Perches <joe@perches.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/net/wireless/orinoco/orinoco_usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c
index 91f0544..f6b43a7 100644
--- a/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -697,8 +697,8 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
 			while (!ctx->done.done && msecs--)
 				udelay(1000);
 		} else {
-			wait_event_interruptible(ctx->done.wait,
-						 ctx->done.done);
+			swait_event_interruptible(ctx->done.wait,
+						  ctx->done.done);
 		}
 		break;
 	default:
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v0 0/8] Simple wait queue support Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 8/8] orinoco_usb: Fix fallout of wait to swait completion change Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 5/8] rcu: Do not call swake_up_all with rnp->lock holding Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 6/8] gadgetfs: Fix fallout of wait to swait completion change Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 2/8] KVM: use simple waitqueue for vcpu->wq Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 3/8] sched/completion: convert completions to use simple wait queues Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
    Re: [PATCH v1 3/8] sched/completion: convert completions to use  simple wait queues Peter Zijlstra <peterz@infradead.org> - 2015-09-09 16:30 +0200
  [PATCH v1 7/8] usb: gadget: f_fs: Fix fallout of wait to swait completion change Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 4/8] rcu: use simple wait queues where possible in rcutree Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200
  [PATCH v1 1/8] wait.[ch]: Introduce the simple waitqueue (swait) implementation Daniel Wagner <daniel.wagner@bmw-carit.de> - 2015-09-09 14:10 +0200

csiph-web