Re: [PATCH] v4l: soc-camera: fix multiple simultaneous user case

[Mauro Carvalho Chehab <mchehab@infradead.org>]

Em 25-12-2010 19:29, Guennadi Liakhovetski escreveu:
> A recent patch has introduced a regression, whereby a second open of an
> soc-camera video device breaks the running capture. This patch fixes this bug
> by guaranteeing, that video buffers get initialised only during the first open
> of the device node.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
> 
> Mauro, please, let's try to get it in 2.6.37, or we'll have to push it to 
> stable after 2.6.37 is out. I'm just posting it quickly and will push it 
> to linuxtv.org like tomorrow or on Monday...

Ok, I've applied it and sent it today to my linux-next tree. Stephen will only 
pull from it at Dec, 27/28, likely in time for the last pull request for .37.

Cheers,
Mauro
> 
>  drivers/media/video/soc_camera.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
> index 335120c..052bd6d 100644
> --- a/drivers/media/video/soc_camera.c
> +++ b/drivers/media/video/soc_camera.c
> @@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file)
>  		ret = soc_camera_set_fmt(icd, &f);
>  		if (ret < 0)
>  			goto esfmt;
> +
> +		ici->ops->init_videobuf(&icd->vb_vidq, icd);
>  	}
>  
>  	file->private_data = icd;
>  	dev_dbg(&icd->dev, "camera device open\n");
>  
> -	ici->ops->init_videobuf(&icd->vb_vidq, icd);
> -
>  	mutex_unlock(&icd->video_lock);
>  
>  	return 0;