Hi Hans,
On 07/05/2012 08:54 AM, Hans Verkuil wrote:
> Hi Sylwester,
>
> It still doesn't apply. This patch starts with:
>
> diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c
> index da2c40e..cb04a870 100644
> --- a/drivers/media/video/s5p-fimc/fimc-capture.c
> +++ b/drivers/media/video/s5p-fimc/fimc-capture.c
> @@ -480,48 +480,59 @@ static int fimc_capture_set_default_format(struct fimc_dev *fimc);
> static int fimc_capture_open(struct file *file)
> {
> struct fimc_dev *fimc = video_drvdata(file);
> - int ret;
> + int ret = -EBUSY;
>
> The actual current source code starts with:
>
> static int fimc_capture_open(struct file *file)
> {
> struct fimc_dev *fimc = video_drvdata(file);
> int ret = v4l2_fh_open(file);
>
> Quite different. That 'int ret = v4l2_fh_open(file);' line was added June 10th, 2011, so
> I don't understand why that isn't in your git repository.
Because is has been removed by one of patches from v4l-fimc-fixes branch
that I sent to Mauro on 25th of May and is still not upstream.
Branch v4l-fimc-next depends on v4l-fimc-fixes, sorry if it wasn't clear
enough. You need to pull v4l-fimc-fixes branch first. If I would have
rebased patches for -next then the fixup patches wouldn't apply. That
just doesn't seem right.
Mauro, are you going to send another pull request to Linus for 3.5-rc,
including these patches: http://patchwork.linuxtv.org/patch/11503 ?
Regards,
--
Sylwester Nawrocki
실베스터 나브로츠키
Samsung Poland R&D Center
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
