]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
Input: s3c2410_ts - fix preparing/enabling clock
authorVasily Khoruzhick <anarsoul@gmail.com>
Wed, 9 Jul 2014 00:57:42 +0000 (17:57 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sun, 20 Jul 2014 21:40:53 +0000 (14:40 -0700)
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>
drivers/input/touchscreen/s3c2410_ts.c

index 19cb247dbb86ef5adc570f38782e6f5954c2ee06..5a69ded9b53cda2a34c9d556d3e9867bb755e26e 100644 (file)
@@ -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);