diff options
| author | Greg Kroah-Hartman | 2014-05-23 04:28:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-05-23 04:28:21 +0200 |
| commit | f8712528ae0bfef50f30b1da3d58e22f4f007889 (patch) | |
| tree | 77dffd5ac91fd75f5e87595adb31176fd2bf3f11 /drivers/usb/gadget/inode.c | |
| parent | xhci: rework command timeout and cancellation, (diff) | |
| parent | usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call. (diff) | |
| download | kernel-qcow2-linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.tar.gz kernel-qcow2-linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.tar.xz kernel-qcow2-linux-f8712528ae0bfef50f30b1da3d58e22f4f007889.zip | |
Merge tag 'usb-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
usb: patches for v3.16 merge window
Not a lot here during this merge window. Mostly we just have
the usual miscellaneous patches (removal of unnecessary prints,
proper dependencies being added to Kconfig, build warning fixes,
new device ID, etc.
Other than those, the only important new features are the
new support for OS Strings which should help Linux Gadget
Drivers behave better under MS Windows. Also Babble Recovery
implementation for MUSB on AM335x. Lastly, we also have
ARCH_QCOM PHY support though phy-msm.
Signed-of-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-mv-u3d-usb.c
Diffstat (limited to 'drivers/usb/gadget/inode.c')
| -rw-r--r-- | drivers/usb/gadget/inode.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index a925d0cbcd41..5b840fb0cce5 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; |