From: Guennadi Liakhovetski Date: Fri, 25 Sep 2009 04:36:51 +0000 (+0900) Subject: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge X-Git-Tag: v2.6.32-rc1~25^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a79aebfca1e597c1aab4b8e327028f96f5ea9095;p=linux-block.git sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge Signed-off-by: Guennadi Liakhovetski Acked-by: Mauro Carvalho Chehab Signed-off-by: Paul Mundt --- diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 5ab7c5aefd62..65ac474c517a 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/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",