From cd9a1acfe88b5cb3c95132950c5704748256608c Mon Sep 17 00:00:00 2001
From: Anton Tikhomirov <av.tikhomirov@samsung.com>
Date: Tue, 6 Mar 2012 14:07:29 +0900
Subject: [PATCH] --- yaml --- r: 299411 b: refs/heads/master c:
 659ad60cb9128345d0a6b9093dda9b0e366b7937 h: refs/heads/master i:   299409:
 ee2dbe837224092b124d4a98efc2d83ae18daf62   299407:
 976f21e1ef42b15955ac04f2add31a630f5903bc v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/s3c-hsotg.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f28fec204ee8..f0ca0ecf1cc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7a83fe19336125d7eb26488788dc66c03f2c08e
+refs/heads/master: 659ad60cb9128345d0a6b9093dda9b0e366b7937
diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c
index e3fe5fd795f0..03de169ab365 100644
--- a/trunk/drivers/usb/gadget/s3c-hsotg.c
+++ b/trunk/drivers/usb/gadget/s3c-hsotg.c
@@ -1696,10 +1696,12 @@ static void s3c_hsotg_set_ep_maxpacket(struct s3c_hsotg *hsotg,
 	reg |= mpsval;
 	writel(reg, regs + S3C_DIEPCTL(ep));
 
-	reg = readl(regs + S3C_DOEPCTL(ep));
-	reg &= ~S3C_DxEPCTL_MPS_MASK;
-	reg |= mpsval;
-	writel(reg, regs + S3C_DOEPCTL(ep));
+	if (ep) {
+		reg = readl(regs + S3C_DOEPCTL(ep));
+		reg &= ~S3C_DxEPCTL_MPS_MASK;
+		reg |= mpsval;
+		writel(reg, regs + S3C_DOEPCTL(ep));
+	}
 
 	return;