From 37215efc4a9c31c96cfa164bb1386a1d70bacb81 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 15 Mar 2012 15:13:31 -0300 Subject: [PATCH] --- yaml --- r: 295108 b: refs/heads/master c: 91acd962301af86d5af02ddefdb8147322a0b9b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pxa_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4783c80aae32..9123f971bd28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48e971cd7fc2440d49159786ecc8786298f98cec +refs/heads/master: 91acd962301af86d5af02ddefdb8147322a0b9b0 diff --git a/trunk/drivers/media/video/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c index 0bd7da26d018..5a413f4427e0 100644 --- a/trunk/drivers/media/video/pxa_camera.c +++ b/trunk/drivers/media/video/pxa_camera.c @@ -921,12 +921,12 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev) /* "Safe default" - 13MHz */ recalculate_fifo_timeout(pcdev, 13000000); - clk_enable(pcdev->clk); + clk_prepare_enable(pcdev->clk); } static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) { - clk_disable(pcdev->clk); + clk_disable_unprepare(pcdev->clk); } static irqreturn_t pxa_camera_irq(int irq, void *data)