Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09c8fb63 authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Dmitry Torokhov
Browse files

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: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Reviewed-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent b4e05923

drivers/input/touchscreen/s3c2410_ts.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -264,7 +264,7 @@ static int s3c2410ts_probe(struct platform_device *pdev) 
		return -ENOENT;

		return -ENOENT;

	}

	}





	clk_enable(ts.clock);

	clk_prepare_enable(ts.clock);

	dev_dbg(dev, "got and enabled clocks\n");

	dev_dbg(dev, "got and enabled clocks\n");





	ts.irq_tc = ret = platform_get_irq(pdev, 0);

	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);

	free_irq(ts.irq_tc, ts.input);

	del_timer_sync(&touch_timer);

	del_timer_sync(&touch_timer);





	clk_disable(ts.clock);

	clk_disable_unprepare(ts.clock);

	clk_put(ts.clock);

	clk_put(ts.clock);





	input_unregister_device(ts.input);

	input_unregister_device(ts.input);