evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: gadget: Do not disconnect unregistered dev"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-11 20:05:50 -08:00 • committed by Gerrit - the friendly Code Review server
commit 2d320e52f7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/gadget/configfs.c
View file

@ -1528,7 +1528,14 @@ static int android_setup(struct usb_gadget *gadget,
static void android_disconnect(struct usb_gadget *gadget) static void android_disconnect(struct usb_gadget *gadget)
{ {
struct usb_composite_dev *cdev = get_gadget_data(gadget); struct usb_composite_dev *cdev = get_gadget_data(gadget);
struct gadget_info *gi = container_of(cdev, struct gadget_info, cdev); struct gadget_info *gi;
if (!cdev) {
pr_err("%s: gadget is not connected\n", __func__);
return;
}
gi = container_of(cdev, struct gadget_info, cdev);
/* accessory HID support can be active while the /* accessory HID support can be active while the
accessory function is not actually enabled, accessory function is not actually enabled,