Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 303552
b: refs/heads/master
c: 8b4fc8c
h: refs/heads/master
v: v3
  • Loading branch information
Jingoo Han authored and Greg Kroah-Hartman committed Apr 18, 2012
1 parent 246d115 commit 620d087
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e0c70d050c7ed6d163897a6ac894f063c31b10f
refs/heads/master: 8b4fc8c7e0ba3022bb6187c809d8d2b955b2d7fd
4 changes: 4 additions & 0 deletions trunk/drivers/usb/host/ehci-s5p.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ static int s5p_ehci_suspend(struct device *dev)
if (pdata && pdata->phy_exit)
pdata->phy_exit(pdev, S5P_USB_PHY_HOST);

clk_disable(s5p_ehci->clk);

return rc;
}

Expand All @@ -243,6 +245,8 @@ static int s5p_ehci_resume(struct device *dev)
struct platform_device *pdev = to_platform_device(dev);
struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;

clk_enable(s5p_ehci->clk);

if (pdata && pdata->phy_init)
pdata->phy_init(pdev, S5P_USB_PHY_HOST);

Expand Down

0 comments on commit 620d087

Please sign in to comment.