On Monday, January 31, 2011 15:12:58 Mauro Carvalho Chehab wrote:
> Em 26-01-2011 05:23, Hans Verkuil escreveu:
> > Mauro, please get this upstream asap since this fix needs to go into 2.6.38
> > as well.
> >
> > Regards,
> >
> > Hans
> >
> > The following changes since commit e5fb95675639f064ca40df7ad319f1c380443999:
> > Hans Verkuil (1):
> > [media] vivi: fix compiler warning
> >
> > are available in the git repository at:
> >
> > ssh://linuxtv.org/git/hverkuil/media_tree.git cx18-fix
> >
> > Hans Verkuil (1):
> > cx18: fix kernel oops when setting MPEG control before capturing.
> >
> > drivers/media/video/cx18/cx18-driver.c | 1 +
> > 1 files changed, 1 insertions(+), 0 deletions(-)
> >
>
> I tried to apply it against 2.6.38-rc2, but it failed:
I think there is a mixup here. The patch is for 2.6.39 and it should apply
cleanly. Please apply for 2.6.39!
It is only necessary to apply it to 2.6.38 if your pull request to Linus of
February 2nd ("V4L/DVB patches") is merged. It still hasn't been merged, so I
suspect that Linus refused them (or are they still pending?).
When I wrote the original mail I mistakenly assumed that the cx18 control
framework patches were already upstream.
So, if your pull request to Linus isn't merged for 2.6.38, then no action
regarding 2.6.38 needs to be taken. If it is merged, then this fix must
be included in 2.6.38 as well.
Regards,
Hans
>
> mutex_init(&cx->serialize_lock);
> mutex_init(&cx->gpio_lock);
> mutex_init(&cx->epu2apu_mb_lock);
> mutex_init(&cx->epu2cpu_mb_lock);
>
> ret = cx18_create_in_workq(cx);
> <<<<<<<
> =======
> cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
> cx->cxhdl.ops = &cx18_cxhdl_ops;
> cx->cxhdl.func = cx18_api_func;
> cx->cxhdl.priv = &cx->streams[CX18_ENC_STREAM_TYPE_MPG];
> ret = cx2341x_handler_init(&cx->cxhdl, 50);
> >>>>>>>
> if (ret)
> return ret;
>
> Perhaps this change requires some patch delayed for .39?
>
> Cheers,
> Mauro
> --
> 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
>
>
--
Hans Verkuil - video4linux developer - sponsored by Cisco
--
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
