diff --git a/[refs] b/[refs]
index f0ca0ecf1cc4..55ddaa1db111 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659ad60cb9128345d0a6b9093dda9b0e366b7937
+refs/heads/master: 70fa030ffb652ace81dd5bcab01255b49723caec
diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c
index 03de169ab365..8db23660b5e2 100644
--- a/trunk/drivers/usb/gadget/s3c-hsotg.c
+++ b/trunk/drivers/usb/gadget/s3c-hsotg.c
@@ -1921,7 +1921,8 @@ static void s3c_hsotg_epint(struct s3c_hsotg *hsotg, unsigned int idx,
 		    ints & S3C_DIEPMSK_TxFIFOEmpty) {
 			dev_dbg(hsotg->dev, "%s: ep%d: TxFIFOEmpty\n",
 				__func__, idx);
-			s3c_hsotg_trytx(hsotg, hs_ep);
+			if (!using_dma(hsotg))
+				s3c_hsotg_trytx(hsotg, hs_ep);
 		}
 	}
 }