diff options
author | Philipp Zabel <philipp.zabel@gmail.com> | 2012-03-15 14:13:31 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-03-19 21:11:07 -0400 |
commit | 91acd962301af86d5af02ddefdb8147322a0b9b0 (patch) | |
tree | 4fb2a28f55c1f92f914de4c695c85c511c47812a /drivers/media | |
parent | 48e971cd7fc2440d49159786ecc8786298f98cec (diff) |
[media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls
This patch adds clk_prepare/clk_unprepare calls to the pxa_camera
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/pxa_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 0bd7da26d018..5a413f4427e0 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
@@ -921,12 +921,12 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev) | |||
921 | /* "Safe default" - 13MHz */ | 921 | /* "Safe default" - 13MHz */ |
922 | recalculate_fifo_timeout(pcdev, 13000000); | 922 | recalculate_fifo_timeout(pcdev, 13000000); |
923 | 923 | ||
924 | clk_enable(pcdev->clk); | 924 | clk_prepare_enable(pcdev->clk); |
925 | } | 925 | } |
926 | 926 | ||
927 | static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) | 927 | static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) |
928 | { | 928 | { |
929 | clk_disable(pcdev->clk); | 929 | clk_disable_unprepare(pcdev->clk); |
930 | } | 930 | } |
931 | 931 | ||
932 | static irqreturn_t pxa_camera_irq(int irq, void *data) | 932 | static irqreturn_t pxa_camera_irq(int irq, void *data) |