summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-30 13:19:14 +0800
committerAndy Green <andy.green@linaro.org>2011-12-30 13:19:14 +0800
commit488d749ed636b767e95a52e3bd2b2a9c05e1fdd3 (patch)
tree5fbcf43fa613fe2f5d1f427d3e5684333d7e6aee
parent4e0a3efdaf103836ea7cbf22abdf4d38e1466706 (diff)
usb musb composite fix oops on rmmod
In composite_disconnect, it's possible to no longer have any valid gadget data for a gadget Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--drivers/usb/gadget/composite.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index aef47414f5d..748e29cf5ab 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1314,6 +1314,9 @@ static void composite_disconnect(struct usb_gadget *gadget)
struct usb_composite_dev *cdev = get_gadget_data(gadget);
unsigned long flags;
+ if (cdev == NULL)
+ return;
+
/* REVISIT: should we have config and device level
* disconnect callbacks?
*/