diff options
author | Vasily Khoruzhick <anarsoul@gmail.com> | 2014-07-08 20:57:42 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-20 17:40:53 -0400 |
commit | 09c8fb63fb976f77af54f10a5ec2e3bb30dfc86f (patch) | |
tree | fd3800cc3842f8722220ec539bd5b71ae15fe36c /drivers/input/touchscreen/s3c2410_ts.c | |
parent | b4e05923f9c5bb65ac82988d7b53cfd7425e6f36 (diff) |
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/touchscreen/s3c2410_ts.c')
-rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 4 |
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) | |||
264 | return -ENOENT; | 264 | return -ENOENT; |
265 | } | 265 | } |
266 | 266 | ||
267 | clk_enable(ts.clock); | 267 | clk_prepare_enable(ts.clock); |
268 | dev_dbg(dev, "got and enabled clocks\n"); | 268 | dev_dbg(dev, "got and enabled clocks\n"); |
269 | 269 | ||
270 | ts.irq_tc = ret = platform_get_irq(pdev, 0); | 270 | ts.irq_tc = ret = platform_get_irq(pdev, 0); |
@@ -369,7 +369,7 @@ static int s3c2410ts_remove(struct platform_device *pdev) | |||
369 | free_irq(ts.irq_tc, ts.input); | 369 | free_irq(ts.irq_tc, ts.input); |
370 | del_timer_sync(&touch_timer); | 370 | del_timer_sync(&touch_timer); |
371 | 371 | ||
372 | clk_disable(ts.clock); | 372 | clk_disable_unprepare(ts.clock); |
373 | clk_put(ts.clock); | 373 | clk_put(ts.clock); |
374 | 374 | ||
375 | input_unregister_device(ts.input); | 375 | input_unregister_device(ts.input); |