From b210c9a7e7c93c4c6f7bec485ea6a5f6e9eab2df Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Mon, 19 Jul 2010 16:01:41 +0200 Subject: [PATCH] --- yaml --- r: 208061 b: refs/heads/master c: 1eb838d3e2a473acbb9b21278e75b79640fb2c7b h: refs/heads/master i: 208059: 8f42a0f290dd9c1cf6f2d2a07856754a54defd8c v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1821f2f7bce4..e916164b82af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d47166c975382f5e95086e8a88d4a39d27b34b5 +refs/heads/master: 1eb838d3e2a473acbb9b21278e75b79640fb2c7b diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index ce272b4d79c4..258ca01ac679 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -2801,9 +2801,11 @@ static void __devinit s3c_hsotg_initep(struct s3c_hsotg *hsotg, static void s3c_hsotg_otgreset(struct s3c_hsotg *hsotg) { struct clk *xusbxti; - u32 osc; + u32 pwr, osc; - writel(0, S3C_PHYPWR); + pwr = readl(S3C_PHYPWR); + pwr &= ~0x19; + writel(pwr, S3C_PHYPWR); mdelay(1); osc = hsotg->plat->is_osc ? S3C_PHYCLK_EXT_OSC : 0;