From af1b7d8c64f17832fa9bd62900877d33f853566c Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 25 Sep 2009 13:36:51 +0900 Subject: [PATCH] --- yaml --- r: 166329 b: refs/heads/master c: a79aebfca1e597c1aab4b8e327028f96f5ea9095 h: refs/heads/master i: 166327: a37c856dbccd7167f73313b03ded86d05c3dc1ca v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 601d554f791b..54c22d9c19a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ecb6fd529942c143c8837dfb11262009c77e9c77 +refs/heads/master: a79aebfca1e597c1aab4b8e327028f96f5ea9095 diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index 5ab7c5aefd62..65ac474c517a 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/drivers/media/video/sh_mobile_ceu_camera.c @@ -404,7 +404,7 @@ static int sh_mobile_ceu_add_device(struct soc_camera_device *icd) "SuperH Mobile CEU driver attached to camera %d\n", icd->devnum); - clk_enable(pcdev->clk); + pm_runtime_get_sync(ici->v4l2_dev.dev); ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ while (ceu_read(pcdev, CSTSR) & 1) @@ -438,7 +438,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd) } spin_unlock_irqrestore(&pcdev->lock, flags); - clk_disable(pcdev->clk); + pm_runtime_put_sync(ici->v4l2_dev.dev); dev_info(icd->dev.parent, "SuperH Mobile CEU driver detached from camera %d\n",