From 6eafcfc218d057f196f062df3770b0a7e68a444e Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Mon, 30 Jul 2012 16:43:44 +0200 Subject: [PATCH] --- yaml --- r: 325811 b: refs/heads/master c: 63fd0ae4b7ca60f7322341b0fbd9cda2f3d2e22d h: refs/heads/master i: 325809: 139fc9f2dd25003afb82abc539de53a815aacca3 325807: fab473ac5c1e26043cd9b511df1b3783122fcb2d v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-s5p.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 48d7372951e2..24b9f3770fd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c5404f7abd250ce71849c2687d266073b54e1d4 +refs/heads/master: 63fd0ae4b7ca60f7322341b0fbd9cda2f3d2e22d diff --git a/trunk/drivers/usb/host/ehci-s5p.c b/trunk/drivers/usb/host/ehci-s5p.c index 9d8f1dd57cb3..d055503e4183 100644 --- a/trunk/drivers/usb/host/ehci-s5p.c +++ b/trunk/drivers/usb/host/ehci-s5p.c @@ -128,7 +128,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) } s5p_ehci->hcd = hcd; - s5p_ehci->clk = clk_get(&pdev->dev, "usbhost"); + s5p_ehci->clk = devm_clk_get(&pdev->dev, "usbhost"); if (IS_ERR(s5p_ehci->clk)) { dev_err(&pdev->dev, "Failed to get usbhost clock\n"); @@ -138,7 +138,7 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) err = clk_enable(s5p_ehci->clk); if (err) - goto fail_clken; + goto fail_clk; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -184,8 +184,6 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) fail_io: clk_disable(s5p_ehci->clk); -fail_clken: - clk_put(s5p_ehci->clk); fail_clk: usb_put_hcd(hcd); return err; @@ -203,7 +201,6 @@ static int __devexit s5p_ehci_remove(struct platform_device *pdev) pdata->phy_exit(pdev, S5P_USB_PHY_HOST); clk_disable(s5p_ehci->clk); - clk_put(s5p_ehci->clk); usb_put_hcd(hcd);