summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2014-04-29 13:26:28 +0800
committerFelipe Balbi <balbi@ti.com>2014-05-12 12:34:46 -0500
commit6027f3173e797bf27fc5053aa74c9f40f85538d8 (patch)
tree7f279f82529406de246f064ccdbccf7d53f135ff
parent1f7fc40876934d52278bb1ee0544191a4b4657f1 (diff)
downloadlinux-6027f3173e797bf27fc5053aa74c9f40f85538d8.tar.gz
linux-6027f3173e797bf27fc5053aa74c9f40f85538d8.tar.bz2
linux-6027f3173e797bf27fc5053aa74c9f40f85538d8.zip
usb: gadget: set gadget state as configured
Set gadget device state as configurated after set configuration has finished. Signed-off-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/gadget/composite.c1
-rw-r--r--drivers/usb/gadget/inode.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index fab906429b80..8060de6562cd 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -634,6 +634,7 @@ static int set_config(struct usb_composite_dev *cdev,
if (!c)
goto done;
+ usb_gadget_set_state(gadget, USB_STATE_CONFIGURED);
cdev->config = c;
/* Initialize all interfaces by setting them to altsetting zero. */
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index b5be6f0308c2..09e21517377c 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1494,6 +1494,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
*/
if (value == 0) {
INFO (dev, "configuration #%d\n", dev->current_config);
+ usb_gadget_set_state(gadget, USB_STATE_CONFIGURED);
if (dev->usermode_setup) {
dev->setup_can_stall = 0;
goto delegate;