From 620d087d23bf29a252222350012ab406d343168d Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Fri, 13 Apr 2012 11:06:36 +0900 Subject: [PATCH] --- yaml --- r: 303552 b: refs/heads/master c: 8b4fc8c7e0ba3022bb6187c809d8d2b955b2d7fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-s5p.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index abe23bc2e820..f1f30bc4e142 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e0c70d050c7ed6d163897a6ac894f063c31b10f +refs/heads/master: 8b4fc8c7e0ba3022bb6187c809d8d2b955b2d7fd diff --git a/trunk/drivers/usb/host/ehci-s5p.c b/trunk/drivers/usb/host/ehci-s5p.c index f098e2a291a0..c474cec064e4 100644 --- a/trunk/drivers/usb/host/ehci-s5p.c +++ b/trunk/drivers/usb/host/ehci-s5p.c @@ -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; } @@ -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);