From 99fe7ffbc3fdbe1f9338b25e567281a00ace8d34 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Fri, 4 May 2012 14:17:15 +0200 Subject: [PATCH] --- yaml --- r: 303831 b: refs/heads/master c: 04b4a0fce530eab728e27e24b5a8d6192c6f70d9 h: refs/heads/master i: 303829: ea9f1dfdd444d49f1f2cdab30e0df89ca644cbdf 303827: e837f93b6be23977dc8145608e798dbdf122a28b 303823: f3f532c912b753e33a9e339b763e6ed5cc2d9d1e v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7ba346264be1..1028bfa97dbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94cb8fd637d7ec4a6685365c3287050969389cbe +refs/heads/master: 04b4a0fce530eab728e27e24b5a8d6192c6f70d9 diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index 34599dff37ff..1cac0be86f68 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -3547,7 +3547,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev) /* reset the system */ - clk_enable(hsotg->clk); + clk_prepare_enable(hsotg->clk); /* regulators */ @@ -3645,7 +3645,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev) regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - clk_disable(hsotg->clk); + clk_disable_unprepare(hsotg->clk); clk_put(hsotg->clk); err_regs: @@ -3687,7 +3687,7 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev) s3c_hsotg_phy_disable(hsotg); regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - clk_disable(hsotg->clk); + clk_disable_unprepare(hsotg->clk); clk_put(hsotg->clk); device_unregister(&hsotg->gadget.dev);