From 7e5afce5b82dc7c3424c8f1f1862fe135d705313 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Mon, 24 May 2010 17:48:56 +0900 Subject: [PATCH] --- yaml --- r: 199831 b: refs/heads/master c: 390b166138e95a47bdfde6582a1935f65e5c6547 h: refs/heads/master i: 199829: d5a447e3a6776ee0f4716c1bedbcd61af8d60e7c 199827: d04a195dfd9f81ba2797ac22e5639970988f300c 199823: c458df7500b756262ec486ea219f85b3e32746c4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8e6c8d888754..64bdb5f1f68c 100644 --- 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 index 1f73b485732d..a6d725dd7335 100644 --- 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,