git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: gadget: f_fs: Remove lock is held before freeing checks
[pandora-kernel.git]
/
drivers
/
usb
/
gadget
/
f_fs.c
diff --git
a/drivers/usb/gadget/f_fs.c
b/drivers/usb/gadget/f_fs.c
index
f63dc6c
..
7f445ec
100644
(file)
--- a/
drivers/usb/gadget/f_fs.c
+++ b/
drivers/usb/gadget/f_fs.c
@@
-2,7
+2,7
@@
* f_fs.c -- user mode file system API for USB composite function controllers
*
* Copyright (C) 2010 Samsung Electronics
* f_fs.c -- user mode file system API for USB composite function controllers
*
* Copyright (C) 2010 Samsung Electronics
- * Author: Michal Nazarewicz <m
.nazarewicz@samsung
.com>
+ * Author: Michal Nazarewicz <m
ina86@mina86
.com>
*
* Based on inode.c (GadgetFS) which was:
* Copyright (C) 2003-2004 David Brownell
*
* Based on inode.c (GadgetFS) which was:
* Copyright (C) 2003-2004 David Brownell
@@
-1258,9
+1258,7
@@
static void ffs_data_put(struct ffs_data *ffs)
if (unlikely(atomic_dec_and_test(&ffs->ref))) {
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
if (unlikely(atomic_dec_and_test(&ffs->ref))) {
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
- BUG_ON(mutex_is_locked(&ffs->mutex) ||
- spin_is_locked(&ffs->ev.waitq.lock) ||
- waitqueue_active(&ffs->ev.waitq) ||
+ BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
waitqueue_active(&ffs->ep0req_completion.wait));
kfree(ffs);
}
waitqueue_active(&ffs->ep0req_completion.wait));
kfree(ffs);
}