diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-03-11 18:59:02 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2014-03-12 05:22:32 -0400 |
| commit | 1eae2e0bf1d54a8bb37aea18ddf9eaae06d54eed (patch) | |
| tree | 704afec3575cc489b9114d12d81f69628a39a18a | |
| parent | 458dc870f7fe2e655458e1c4cd14c7c74446c1ab (diff) | |
Revert "swait: Add a few more users"
This reverts commit 6f949fe5c42e639f6d6ab2c267bfc1d57ce5ec02.
Seems that swait updates for 3.4-rt broke things.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_usb.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/inode.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_usb.c b/drivers/net/wireless/orinoco/orinoco_usb.c index 8152c94d4211..f634d4582bfe 100644 --- a/drivers/net/wireless/orinoco/orinoco_usb.c +++ b/drivers/net/wireless/orinoco/orinoco_usb.c @@ -714,7 +714,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv, while (!ctx->done.done && msecs--) udelay(1000); } else { - swait_event_interruptible(ctx->done.wait, + wait_event_interruptible(ctx->done.wait, ctx->done.done); } break; diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 54ea4e905e7a..f52cb1ae45d9 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -1255,7 +1255,7 @@ static void ffs_data_put(struct ffs_data *ffs) pr_info("%s(): freeing\n", __func__); ffs_data_clear(ffs); BUG_ON(waitqueue_active(&ffs->ev.waitq) || - swaitqueue_active(&ffs->ep0req_completion.wait)); + waitqueue_active(&ffs->ep0req_completion.wait)); kfree(ffs); } } diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index 2dfd196f4baa..e58b16442971 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -339,7 +339,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) spin_unlock_irq (&epdata->dev->lock); if (likely (value == 0)) { - value = swait_event_interruptible (done.wait, done.done); + value = wait_event_interruptible (done.wait, done.done); if (value != 0) { spin_lock_irq (&epdata->dev->lock); if (likely (epdata->ep != NULL)) { @@ -348,7 +348,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) usb_ep_dequeue (epdata->ep, epdata->req); spin_unlock_irq (&epdata->dev->lock); - swait_event (done.wait, done.done); + wait_event (done.wait, done.done); if (epdata->status == -ECONNRESET) epdata->status = -EINTR; } else { |