diff options
author | Robert Baldyga <r.baldyga@samsung.com> | 2014-10-09 03:41:16 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-10-23 10:55:42 -0400 |
commit | a3058a5d82e296daaca07411c3738a9ddd79f302 (patch) | |
tree | 5556fb3b080d2fae4fa365c5f6c1115142351f3e | |
parent | f1113be1bff674b8410fcb301d6551ab5a43193e (diff) |
usb: gadget: f_fs: remove redundant ffs_data_get()
During FunctionFS bind, ffs_data_get() function was called twice
(in functionfs_bind() and in ffs_do_functionfs_bind()), while on unbind
ffs_data_put() was called once (in functionfs_unbind() function).
In result refcount never reached value 0, and ffs memory resources has
been never released.
Since ffs_data_get() call in ffs_do_functionfs_bind() is redundant
and not neccessary, we remove it to have equal number of gets ans puts,
and free allocated memory after refcount reach 0.
Fixes: 5920cda (usb: gadget: FunctionFS: convert to new function
interface with backward compatibility)
Cc: <stable@vger.kernel.org> # v3.14+
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r-- | drivers/usb/gadget/function/f_fs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 7c6771d027a2..12dbdafd78a8 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c | |||
@@ -2663,8 +2663,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f, | |||
2663 | func->conf = c; | 2663 | func->conf = c; |
2664 | func->gadget = c->cdev->gadget; | 2664 | func->gadget = c->cdev->gadget; |
2665 | 2665 | ||
2666 | ffs_data_get(func->ffs); | ||
2667 | |||
2668 | /* | 2666 | /* |
2669 | * in drivers/usb/gadget/configfs.c:configfs_composite_bind() | 2667 | * in drivers/usb/gadget/configfs.c:configfs_composite_bind() |
2670 | * configurations are bound in sequence with list_for_each_entry, | 2668 | * configurations are bound in sequence with list_for_each_entry, |