usb: f_fs: Prevent gadget unbind if it is already unbound

Message ID
State New
Headers show
  • usb: f_fs: Prevent gadget unbind if it is already unbound
Related show

Commit Message

Amit Pundir Jan. 9, 2018, 7 a.m.
From: Hemant Kumar <>

Upon usb composition switch there is possibility of ep0 file
release happening after gadget driver bind. In case of composition
switch from adb to a non-adb composition gadget will never gets
bound again resulting into failure of usb device enumeration. Fix
this issue by checking FFS_FL_BOUND flag and avoid extra
gadget driver unbind if it is already done as part of composition

This fixes adb reconnection error reported on Android running
v4.4 and above kernel versions. Verified on Hikey running vanilla
v4.15-rc7 + few out of tree Mali patches.


Cc: Felipe Balbi <>
Cc: Greg KH <>
Cc: Michal Nazarewicz <>
Cc: John Stultz <>
Cc: Dmitry Shmidt <>
Cc: Badhri <>
Cc: Android Kernel Team <>
Signed-off-by: Hemant Kumar <>

[AmitP: Cherry-picked it from android-4.14 and updated the commit log]
Signed-off-by: Amit Pundir <>

 drivers/usb/gadget/function/f_fs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to
More majordomo info at


diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index b6cf5ab5a0a1..f9bd351637cd 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -3700,7 +3700,8 @@  static void ffs_closed(struct ffs_data *ffs)
 	ci = opts->>ci_parent;
-	unregister_gadget_item(ci);
+	if (test_bit(FFS_FL_BOUND, &ffs->flags))
+		unregister_gadget_item(ci);