Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208061
b: refs/heads/master
c: 1eb838d
h: refs/heads/master
i:
  208059: 8f42a0f
v: v3
  • Loading branch information
Marek Szyprowski authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 6e36825 commit b210c9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4d47166c975382f5e95086e8a88d4a39d27b34b5
refs/heads/master: 1eb838d3e2a473acbb9b21278e75b79640fb2c7b
6 changes: 4 additions & 2 deletions trunk/drivers/usb/gadget/s3c-hsotg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b210c9a

Please sign in to comment.