summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-12-30 13:19:14 +0800
committerSebastien Jan <s-jan@ti.com>2012-01-06 16:41:29 +0100
commit762650ac6964ed7ca4319ae3299433b238ac59a0 (patch)
treec3b6f1fd876fc3ae8abdfd5b62c8bf1b5e80d700
parent61a5144d944e594ede26448f7c3376788ad07f6c (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 aef47414f5d5..748e29cf5abd 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?
*/