aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Baldyga <r.baldyga@samsung.com>2014-11-10 09:19:57 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 09:00:11 -0800
commit3ee437c556e18984624a018915ec34defa259423 (patch)
tree6272dfd69d27e0b7f462bf0c49755719fbdb2980
parentb699efa9426d3bc72123a713cd53ffb8e97c5f85 (diff)
downloadlinux-yocto-3ee437c556e18984624a018915ec34defa259423.tar.gz
linux-yocto-3ee437c556e18984624a018915ec34defa259423.tar.bz2
linux-yocto-3ee437c556e18984624a018915ec34defa259423.zip
usb: gadget: f_fs: remove redundant ffs_data_get()
[ Upstream commit a3058a5d82e296daaca07411c3738a9ddd79f302 ] 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) Signed-off-by: Robert Baldyga <r.baldyga@samsung.com> Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/gadget/f_fs.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 5bcf7d001259..afd0a159fe61 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1995,8 +1995,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f,
func->conf = c;
func->gadget = c->cdev->gadget;
- ffs_data_get(func->ffs);
-
/*
* in drivers/usb/gadget/configfs.c:configfs_composite_bind()
* configurations are bound in sequence with list_for_each_entry,