diff --git a/[refs] b/[refs]
index 20a0e59253e7..726ddf92ad93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4ce9084476dc518bfd0f35f62f4bd0a130893e0
+refs/heads/master: daba58035a044cae75488175a96cc18362a64518
diff --git a/trunk/drivers/usb/gadget/composite.c b/trunk/drivers/usb/gadget/composite.c
index 7b5cc16e4a0b..96413a240fdf 100644
--- a/trunk/drivers/usb/gadget/composite.c
+++ b/trunk/drivers/usb/gadget/composite.c
@@ -1047,9 +1047,9 @@ composite_unbind(struct usb_gadget *gadget)
 		kfree(cdev->req->buf);
 		usb_ep_free_request(gadget->ep0, cdev->req);
 	}
+	device_remove_file(&gadget->dev, &dev_attr_suspended);
 	kfree(cdev);
 	set_gadget_data(gadget, NULL);
-	device_remove_file(&gadget->dev, &dev_attr_suspended);
 	composite = NULL;
 }