From: Vasily Khoruzhick Date: Wed, 9 Jul 2014 00:57:42 +0000 (-0700) Subject: Input: s3c2410_ts - fix preparing/enabling clock X-Git-Tag: v4.6-rc1~9^2~552 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09c8fb63fb976f77af54f10a5ec2e3bb30dfc86f;p=platform%2Fkernel%2Flinux-exynos.git Input: s3c2410_ts - fix preparing/enabling clock Use clk_prepare_enable/clk_disable_unprepare to make the driver work properly with common clock framework. Signed-off-by: Vasily Khoruzhick Reviewed-by: Tomasz Figa Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 19cb247..5a69ded 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -264,7 +264,7 @@ static int s3c2410ts_probe(struct platform_device *pdev) return -ENOENT; } - clk_enable(ts.clock); + clk_prepare_enable(ts.clock); dev_dbg(dev, "got and enabled clocks\n"); ts.irq_tc = ret = platform_get_irq(pdev, 0); @@ -369,7 +369,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) free_irq(ts.irq_tc, ts.input); del_timer_sync(&touch_timer); - clk_disable(ts.clock); + clk_disable_unprepare(ts.clock); clk_put(ts.clock); input_unregister_device(ts.input);