---

yaml --- r: 199831 b: refs/heads/master c: 390b166 h: refs/heads/master i: 199829: d5a447e 199827: d04a195 199823: c458df7 v: v3
git-mirror · Jun 4, 2010 · 7e5afce · 7e5afce
1 parent 1c10edc
commit 7e5afce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0238634d02dd10b678ebe9ea5d8803483277ee93
+refs/heads/master: 390b166138e95a47bdfde6582a1935f65e5c6547
diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c
@@ -2730,6 +2730,9 @@ static void s3c_hsotg_init(struct s3c_hsotg *hsotg)
 
 	writel(0, hsotg->regs + S3C_DAINTMSK);
 
+	/* Be in disconnected state until gadget is registered */
+	__orr32(hsotg->regs + S3C_DCTL, S3C_DCTL_SftDiscon);
+
 	if (0) {
 		/* post global nak until we're ready */
 		writel(S3C_DCTL_SGNPInNAK | S3C_DCTL_SGOUTNak,