diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-11 20:05:50 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-11 20:05:49 -0800 |
| commit | 2d320e52f7b94ebdd6a6ecd145e5145972e1dd9f (patch) | |
| tree | 8947dbf3e447dc37249823e461b92cf340150303 /drivers | |
| parent | 20f034903f7a940e25abdad4dc4c25619187bcef (diff) | |
| parent | 02153a0f439130b3a65ae42d9ef20381e59a4774 (diff) | |
Merge "usb: gadget: Do not disconnect unregistered dev"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/configfs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c index 5db4fe9e3cdf..be29dc4bef89 100644 --- a/drivers/usb/gadget/configfs.c +++ b/drivers/usb/gadget/configfs.c @@ -1528,7 +1528,14 @@ static int android_setup(struct usb_gadget *gadget, static void android_disconnect(struct usb_gadget *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 function is not actually enabled, |