summaryrefslogtreecommitdiffstats
path: root/drivers/usb/dwc3/ep0.c
diff options
context:
space:
mode:
authorJames Morris2012-09-28 05:37:32 +0200
committerJames Morris2012-09-28 05:37:32 +0200
commitbf5308344527d015ac9a6d2bda4ad4d40fd7d943 (patch)
tree566e61e2cfc648c374d15cfc8c661b73e1a471f8 /drivers/usb/dwc3/ep0.c
parentMerge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next (diff)
parentLinux 3.6-rc7 (diff)
downloadkernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.gz
kernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.tar.xz
kernel-qcow2-linux-bf5308344527d015ac9a6d2bda4ad4d40fd7d943.zip
Merge tag 'v3.6-rc7' into next
Linux 3.6-rc7 Requested by David Howells so he can merge his key susbsystem work into my tree with requisite -linus changesets.
Diffstat (limited to 'drivers/usb/dwc3/ep0.c')
-rw-r--r--drivers/usb/dwc3/ep0.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index 9b94886b66e5..e4d5ca86b9da 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -720,7 +720,6 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
transferred = min_t(u32, ur->length,
transfer_size - length);
memcpy(ur->buf, dwc->ep0_bounce, transferred);
- dwc->ep0_bounced = false;
} else {
transferred = ur->length - length;
}