diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-09-25 00:36:51 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-25 00:36:51 -0400 |
commit | a79aebfca1e597c1aab4b8e327028f96f5ea9095 (patch) | |
tree | b341bff99abc31dc94ce4181c1efc42f2db472f9 /drivers/media | |
parent | ecb6fd529942c143c8837dfb11262009c77e9c77 (diff) |
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) | |||
404 | "SuperH Mobile CEU driver attached to camera %d\n", | 404 | "SuperH Mobile CEU driver attached to camera %d\n", |
405 | icd->devnum); | 405 | icd->devnum); |
406 | 406 | ||
407 | clk_enable(pcdev->clk); | 407 | pm_runtime_get_sync(ici->v4l2_dev.dev); |
408 | 408 | ||
409 | ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ | 409 | ceu_write(pcdev, CAPSR, 1 << 16); /* reset */ |
410 | while (ceu_read(pcdev, CSTSR) & 1) | 410 | while (ceu_read(pcdev, CSTSR) & 1) |
@@ -438,7 +438,7 @@ static void sh_mobile_ceu_remove_device(struct soc_camera_device *icd) | |||
438 | } | 438 | } |
439 | spin_unlock_irqrestore(&pcdev->lock, flags); | 439 | spin_unlock_irqrestore(&pcdev->lock, flags); |
440 | 440 | ||
441 | clk_disable(pcdev->clk); | 441 | pm_runtime_put_sync(ici->v4l2_dev.dev); |
442 | 442 | ||
443 | dev_info(icd->dev.parent, | 443 | dev_info(icd->dev.parent, |
444 | "SuperH Mobile CEU driver detached from camera %d\n", | 444 | "SuperH Mobile CEU driver detached from camera %d\n", |