summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-03-16 20:01:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-16 21:30:10 +0100
commit647d558023e3868725b381b4dccbbeae3448fc28 (patch)
treefd69b070831ddbf7ad1c32dfa33d00f3e95878de /drivers/usb
parentUSB: option: make interface blacklist work again (diff)
downloadlinux-647d558023e3868725b381b4dccbbeae3448fc28.tar.xz
linux-647d558023e3868725b381b4dccbbeae3448fc28.zip
usb: gadget: f_fs: Remove lock is held before freeing checks
lock debugging already supports this, no need to do it explicitely. Cc: balbi@ti.com Cc: gregkh@linuxfoundation.org Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/f_fs.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 7e2216f1bbe6..7f445ec723bc 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -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);
- 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);
}