sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 25 Sep 2009 04:36:51 +0000 (13:36 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 25 Sep 2009 04:36:51 +0000 (13:36 +0900)
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
drivers/media/video/sh_mobile_ceu_camera.c

index 5ab7c5aefd62d28ebf973d588e32964014ea729c..65ac474c517acf9a3df55f4b4f20be35ca91dd4b 100644 (file)
@@ -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",