diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-03-11 11:57:32 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@rostedt.homelinux.com> | 2014-04-24 22:17:57 -0400 |
| commit | 3d6eca223de1f830d4aff59230b785a49f82692c (patch) | |
| tree | e0787a3dbf35c7a6ed790f1ff60e4d3379d8f5e0 /drivers/usb/gadget/f_fs.c | |
| parent | 6fa0b24c51fbb63bd153326ec49a687073b72722 (diff) | |
Revert "swait: Add a few more users"
This reverts commit 916c8d2de3c4759f57426fa3cfee63b491e88939.
Seems that I was a bit too aggressive in backporting patches. I have
to run make allmodconfigs to test them now. This patch broke the 3.2-rt
for the modified files, as the updates used swait functionality that
was not created in 3.2-rt.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index c6154cadff98..0e641a1eabd0 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -1270,7 +1270,7 @@ static void ffs_data_put(struct ffs_data *ffs) BUG_ON(mutex_is_locked(&ffs->mutex) || spin_is_locked(&ffs->ev.waitq.lock) || waitqueue_active(&ffs->ev.waitq) || - swaitqueue_active(&ffs->ep0req_completion.wait)); + waitqueue_active(&ffs->ep0req_completion.wait)); kfree(ffs); } } |