On Wed, 23 Sep 2009, Guennadi Liakhovetski wrote: > Hi Mauro > > The following two patches are for 2.6.32. One of them fixes > sh_mobile_ceu_camera compile breakage, and another one adds a new > soc-camera / v4l2-subdev driver for ov9640. Marek, looks like you didn't > even compile tested your driver with CONFIG_VIDEO_ADV_DEBUG=y. It didn't > compile, so, I had to fix it. > > Please pull from http://linuxtv.org/hg/~gliakhovetski/v4l-dvb > > for the following 2 changesets: > > 01/02: V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV9640 > sensor > http://linuxtv.org/hg/~gliakhovetski/v4l-dvb?cmd=changeset;node=1dec51b360a3 > > 02/02: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge > http://linuxtv.org/hg/~gliakhovetski/v4l-dvb?cmd=changeset;node=a798c751f06d
Sorry, forgot to mention, somehow, the git and the hg versions got different merges, both wrong, so, for the git the following equivalent patch will be needed, after which the two versions shall be in sync again: sh_mobile_ceu_camera: fix compile breakage, caused by a bad merge Signed-off-by: Guennadi Liakhovetski <[email protected]> --- diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 5ab7c5a..65ac474 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", Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
