From a388ec473132674b4a9018cb7ef221fbc75a8c91 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Sun, 2 Apr 2006 10:18:53 -0800
Subject: [PATCH] --- yaml --- r: 25744 b: refs/heads/master c:
 68dcc688d1f042842a8fb523e4a584b3211181d1 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/usb/gadget/net2280.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d5672807bda1..afe7058580cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42795410c325108d59d0b1e750657197a7374c04
+refs/heads/master: 68dcc688d1f042842a8fb523e4a584b3211181d1
diff --git a/trunk/drivers/usb/gadget/net2280.c b/trunk/drivers/usb/gadget/net2280.c
index 7682c07035bd..6a4b93ad1082 100644
--- a/trunk/drivers/usb/gadget/net2280.c
+++ b/trunk/drivers/usb/gadget/net2280.c
@@ -2241,7 +2241,8 @@ static void handle_ep_small (struct net2280_ep *ep)
 			if (likely (req)) {
 				req->td->dmacount = 0;
 				t = readl (&ep->regs->ep_avail);
-				dma_done (ep, req, count, t);
+				dma_done (ep, req, count,
+					(ep->out_overflow || t) ? -EOVERFLOW : 0);
 			}
 
 			/* also flush to prevent erratum 0106 trouble */