diff options
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
-rw-r--r-- | drivers/usb/gadget/f_fs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index f63dc6c150d2..7f445ec723bc 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * f_fs.c -- user mode file system API for USB composite function controllers | 2 | * f_fs.c -- user mode file system API for USB composite function controllers |
3 | * | 3 | * |
4 | * Copyright (C) 2010 Samsung Electronics | 4 | * Copyright (C) 2010 Samsung Electronics |
5 | * Author: Michal Nazarewicz <m.nazarewicz@samsung.com> | 5 | * Author: Michal Nazarewicz <mina86@mina86.com> |
6 | * | 6 | * |
7 | * Based on inode.c (GadgetFS) which was: | 7 | * Based on inode.c (GadgetFS) which was: |
8 | * Copyright (C) 2003-2004 David Brownell | 8 | * Copyright (C) 2003-2004 David Brownell |
@@ -1258,9 +1258,7 @@ static void ffs_data_put(struct ffs_data *ffs) | |||
1258 | if (unlikely(atomic_dec_and_test(&ffs->ref))) { | 1258 | if (unlikely(atomic_dec_and_test(&ffs->ref))) { |
1259 | pr_info("%s(): freeing\n", __func__); | 1259 | pr_info("%s(): freeing\n", __func__); |
1260 | ffs_data_clear(ffs); | 1260 | ffs_data_clear(ffs); |
1261 | BUG_ON(mutex_is_locked(&ffs->mutex) || | 1261 | BUG_ON(waitqueue_active(&ffs->ev.waitq) || |
1262 | spin_is_locked(&ffs->ev.waitq.lock) || | ||
1263 | waitqueue_active(&ffs->ev.waitq) || | ||
1264 | waitqueue_active(&ffs->ep0req_completion.wait)); | 1262 | waitqueue_active(&ffs->ep0req_completion.wait)); |
1265 | kfree(ffs); | 1263 | kfree(ffs); |
1266 | } | 1264 | } |