lkml.org 
[lkml]   [2018]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 103/410] usb: f_fs: Prevent gadget unbind if it is already unbound
    3.16.57-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hemant Kumar <hemantk@codeaurora.org>

    commit ce5bf9a50daf2d9078b505aca1cea22e88ecb94a upstream.

    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
    switch.

    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.

    Reviewed-at: https://android-review.googlesource.com/#/c/582632/

    Cc: Felipe Balbi <balbi@kernel.org>
    Cc: Greg KH <gregkh@linux-foundation.org>
    Cc: Michal Nazarewicz <mina86@mina86.com>
    Cc: John Stultz <john.stultz@linaro.org>
    Cc: Dmitry Shmidt <dimitrysh@google.com>
    Cc: Badhri <badhri@google.com>
    Cc: Android Kernel Team <kernel-team@android.com>
    Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
    [AmitP: Cherry-picked it from android-4.14 and updated the commit log]
    Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/gadget/f_fs.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/usb/gadget/f_fs.c
    +++ b/drivers/usb/gadget/f_fs.c
    @@ -3019,7 +3019,8 @@ static void ffs_closed(struct ffs_data *
    ci = ffs_obj->opts->func_inst.group.cg_item.ci_parent->ci_parent;
    ffs_dev_unlock();

    - unregister_gadget_item(ci);
    + if (test_bit(FFS_FL_BOUND, &ffs->flags))
    + unregister_gadget_item(ci);
    return;
    done:
    ffs_dev_unlock();
    \
     
     \ /
      Last update: 2018-06-07 17:17    [W:4.165 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site