aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2009-10-31 14:25:25 +0100
committerLars-Peter Clausen <lars@metafoo.de>2009-10-31 14:25:25 +0100
commitb6854a796d0dd4c1763d9afe8b5f67980d07821e (patch)
treef207d2702851c557d03eb424ce9cef193c0adb13
parent399e0854777c263dee8f5abcbe5749007e594ee5 (diff)
parent9163949be7080375bd6e499ee300f0e842b25a16 (diff)
Merge branch 'om-s3c-2.6.31' into om-gta02-2.6.31
-rw-r--r--drivers/usb/gadget/s3c2410_udc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index a9b452fe622..e7739a605c6 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -842,6 +842,7 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
u32 ep_csr1;
u32 idx;
+handle_ep_again:
if (likely (!list_empty(&ep->queue)))
req = list_entry(ep->queue.next,
struct s3c2410_request, queue);
@@ -881,6 +882,8 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
if ((ep_csr1 & S3C2410_UDC_OCSR1_PKTRDY) && req) {
s3c2410_udc_read_fifo(ep,req);
+ if (s3c2410_udc_fifo_count_out())
+ goto handle_ep_again;
}
}
}