On Tue, 2010-11-16 at 22:56 +0100, Hans Verkuil wrote: > Signed-off-by: Hans Verkuil <hverkuil@xxxxxxxxx> > --- > drivers/media/video/cx18/cx18-streams.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c > index 9045f1e..ab461e2 100644 > --- a/drivers/media/video/cx18/cx18-streams.c > +++ b/drivers/media/video/cx18/cx18-streams.c > @@ -41,7 +41,7 @@ static struct v4l2_file_operations cx18_v4l2_enc_fops = { > .read = cx18_v4l2_read, > .open = cx18_v4l2_open, > /* FIXME change to video_ioctl2 if serialization lock can be removed */ > - .ioctl = cx18_v4l2_ioctl, > + .unlocked_ioctl = cx18_v4l2_ioctl, > .release = cx18_v4l2_close, > .poll = cx18_v4l2_enc_poll, > }; Hans, Because I haven't done my homework on the ALSA API, could you also add snd_cx18_lock()/snd_cx18_unlock() in snd_cx18_pcm_ioctl()? Devin, Do you know off the top of your head if any other operations in cx18-alsa-* may need additional locking? I am an ALSA API callback idiot. :) Regards, Andy -- 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