diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 10:44:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 10:44:14 -0400 |
| commit | 53cddfcc0e760d2b364878b6dadbd0c6d087cfae (patch) | |
| tree | 3f2471b2452467b50c80cd61b12f708b2df39e0e /drivers | |
| parent | c09c2d1089b55a3da7058a2f1a76c2f21c8b0688 (diff) | |
| parent | a79aebfca1e597c1aab4b8e327028f96f5ea9095 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge
sh: Add support DMA Engine to SH7780
sh: Add support DMA Engine to SH7722
sh: enable onenand support in kfr2r09 defconfig.
sh: update defconfigs.
sh: add FSI driver support for ms7724se
sh: Fix up uninitialized variable use caught by gcc 4.4.
sh: Handle unaligned 16-bit instructions on SH-2A.
sh: mach-ecovec24: Add active low setting for sh_eth
sh: includecheck fix: dwarf.c
Diffstat (limited to 'drivers')
| -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", |