diff options
author | Rakesh Bodla <rbodla@nvidia.com> | 2012-08-14 17:36:15 +0530 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-08-16 13:46:29 -0700 |
commit | d9b6490efce58b5790a7e5d02727b0aa6b357c9e (patch) | |
tree | 013e735eed3179208d0c463683fa893b1cc78ec1 /drivers/usb/gadget/android.c | |
parent | 23d5fe76cdc190682d1ca7cd1db0b4933631779c (diff) |
USB: gadget: f_accessory: Add support for HID input devices
Bug 1026047
Signed-off-by: Mike Lockwood <lockwood@google.com>
(cherry picked from commit 7a3d01af4f04950a86a18f5a439f1802d8093650)
Conflicts:
drivers/usb/gadget/f_accessory.c
Change-Id: I30bc02a1bcf636967d56370db83578f49f0e7514
Signed-off-by: Rakesh Bodla <rbodla@nvidia.com>
Reviewed-on: http://git-master/r/123342
Reviewed-by: Venkat Moganty <vmoganty@nvidia.com>
Diffstat (limited to 'drivers/usb/gadget/android.c')
-rw-r--r-- | drivers/usb/gadget/android.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/gadget/android.c b/drivers/usb/gadget/android.c index 4805670cf6e3..e23557e649b7 100644 --- a/drivers/usb/gadget/android.c +++ b/drivers/usb/gadget/android.c @@ -1113,6 +1113,11 @@ static void android_disconnect(struct usb_gadget *gadget) unsigned long flags; composite_disconnect(gadget); + /* accessory HID support can be active while the + accessory function is not actually enabled, + so we need to inform it when we are disconnected. + */ + acc_disconnect(); spin_lock_irqsave(&cdev->lock, flags); dev->connected = 0; |