summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Tikhomirov2011-04-21 10:06:42 +0200
committerGreg Kroah-Hartman2011-05-03 02:00:26 +0200
commitf8acb08d8a1b2edab352430bd32c0e694bc65bc5 (patch)
tree7cae8ea40fe2d0cf87af913ccafa6261eed4399a
parentUSB: s3c-hsotg: Fix stall condition processing (diff)
downloadkernel-qcow2-linux-f8acb08d8a1b2edab352430bd32c0e694bc65bc5.tar.gz
kernel-qcow2-linux-f8acb08d8a1b2edab352430bd32c0e694bc65bc5.tar.xz
kernel-qcow2-linux-f8acb08d8a1b2edab352430bd32c0e694bc65bc5.zip
USB: s3c-hsotg: Fix hang up after reset
When File Storage gadget receives SET CONFIGURATION request it tries to cancel all pending transfers. If some request is in progress, gadget waits for its completion. This commit allows gadget to dequeue invalid requests in progress left after reset. Signed-off-by: Anton Tikhomirov <av.tikhomirov@samsung.com> Reviewed-by: Kyoungil Kim<ki0351.kim@samsung.com> Cc: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/s3c-hsotg.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c
index 6be424e2cc60..ea38d3067801 100644
--- a/drivers/usb/gadget/s3c-hsotg.c
+++ b/drivers/usb/gadget/s3c-hsotg.c
@@ -2447,11 +2447,6 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
dev_info(hs->dev, "ep_dequeue(%p,%p)\n", ep, req);
- if (hs_req == hs_ep->req) {
- dev_dbg(hs->dev, "%s: already in progress\n", __func__);
- return -EINPROGRESS;
- }
-
spin_lock_irqsave(&hs_ep->lock, flags);
if (!on_list(hs_ep, hs_req)) {