commit a993eb16a1d9fad8b01f223a800b5fac51025828
author Linux Build Service Account <lnxbuild@localhost> Fri Jun 21 13:30:59 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jun 21 13:30:59 2013 -0700
tree 4a8898423a0c6d741b3fa6bca78b62913848ce2b
parent 44defc2c4f000c5284707740e75f4163386088d0
parent e236bfa3da6dee0e373cbfb1d2efe41e5e6e4d1d

Merge "usb: gadget: composite: Fix a bug in delayed status handling"

drivers/usb/gadget/composite.c

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index de4a233..dfd23f0 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -1371,6 +1371,10 @@
 		reset_config(cdev);
 	if (composite->disconnect)
 		composite->disconnect(cdev);
+	if (cdev->delayed_status != 0) {
+		INFO(cdev, "delayed status mismatch..resetting\n");
+		cdev->delayed_status = 0;
+	}
 	spin_unlock_irqrestore(&cdev->lock, flags);
 }