summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2014-07-09 04:57:42 +0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-21 01:40:53 +0400
commit09c8fb63fb976f77af54f10a5ec2e3bb30dfc86f (patch)
treefd3800cc3842f8722220ec539bd5b71ae15fe36c /drivers/input
parentb4e05923f9c5bb65ac82988d7b53cfd7425e6f36 (diff)
downloadlinux-09c8fb63fb976f77af54f10a5ec2e3bb30dfc86f.tar.xz
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 <anarsoul@gmail.com> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/s3c2410_ts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 19cb247dbb86..5a69ded9b53c 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);