Commit 2bea0ce7 authored by Robert Baldyga's avatar Robert Baldyga Committed by Luis Henriques

usb: gadget: f_fs: remove redundant ffs_data_get()

commit a3058a5d upstream.

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: 5920cda6 (usb: gadget: FunctionFS: convert to new function
	interface with backward compatibility)
Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
[ luis: backported to 3.16: file rename:
  drivers/usb/gadget/function/f_fs.c -> drivers/usb/gadget/f_fs.c ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 9a7d9287
...@@ -2297,8 +2297,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f, ...@@ -2297,8 +2297,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f,
func->conf = c; func->conf = c;
func->gadget = c->cdev->gadget; func->gadget = c->cdev->gadget;
ffs_data_get(func->ffs);
/* /*
* in drivers/usb/gadget/configfs.c:configfs_composite_bind() * in drivers/usb/gadget/configfs.c:configfs_composite_bind()
* configurations are bound in sequence with list_for_each_entry, * configurations are bound in sequence with list_for_each_entry,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment