diff options
| author |   Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-09-25 13:36:51 +0900 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2009-09-25 13:36:51 +0900 |
| commit | a79aebfca1e597c1aab4b8e327028f96f5ea9095 (patch) | |
| tree | b341bff99abc31dc94ce4181c1efc42f2db472f9 /drivers/media | |
| parent | sh: Add support DMA Engine to SH7780 (diff) | |
| download | linux-dev-a79aebfca1e597c1aab4b8e327028f96f5ea9095.tar.xz linux-dev-a79aebfca1e597c1aab4b8e327028f96f5ea9095.zip | |
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
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", |