From 9628d18cd6fe3beb95bf20fed829c06206096b83 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 25 May 2012 20:14:47 -0300 Subject: [PATCH] --- yaml --- r: 322066 b: refs/heads/master c: 5c4dfc84a88e1108f5ddba256ecaab6fe45f94e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx1_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86a17f39cbb5..64478b156874 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1690d86aa33fa14c0ae4ac97e59d806eeddccd2c +refs/heads/master: 5c4dfc84a88e1108f5ddba256ecaab6fe45f94e5 diff --git a/trunk/drivers/media/video/mx1_camera.c b/trunk/drivers/media/video/mx1_camera.c index d2e6f82ecfac..560a65aa7038 100644 --- a/trunk/drivers/media/video/mx1_camera.c +++ b/trunk/drivers/media/video/mx1_camera.c @@ -403,7 +403,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev) dev_dbg(pcdev->icd->parent, "Activate device\n"); - clk_enable(pcdev->clk); + clk_prepare_enable(pcdev->clk); /* enable CSI before doing anything else */ __raw_writel(csicr1, pcdev->base + CSICR1); @@ -422,7 +422,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev) /* Disable all CSI interface */ __raw_writel(0x00, pcdev->base + CSICR1); - clk_disable(pcdev->clk); + clk_disable_unprepare(pcdev->clk); } /*