diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-11 06:52:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:51:08 -0300 |
| commit | ffcc1c082fdd8e3013f25f670d1fe66f86e04138 (patch) | |
| tree | 500f767b7d9ec9c6eeceb125c812fdeaf8e0c4d0 /drivers/staging/media/go7007/go7007-usb.c | |
| parent | 899eb84ce3b50dfa8de6a12e6f39f4e30fde9781 (diff) | |
| download | linux-ffcc1c082fdd8e3013f25f670d1fe66f86e04138.tar.bz2 | |
[media] go7007: convert to core locking and vb2
Convert this driver to videobuf2 and core locking.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media/go7007/go7007-usb.c')
| -rw-r--r-- | drivers/staging/media/go7007/go7007-usb.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c index 5c7a19e6fb68..c95538c735d9 100644 --- a/drivers/staging/media/go7007/go7007-usb.c +++ b/drivers/staging/media/go7007/go7007-usb.c @@ -780,7 +780,7 @@ static void go7007_usb_read_video_pipe_complete(struct urb *urb) struct go7007 *go = (struct go7007 *)urb->context; int r, status = urb->status; - if (!go->streaming) { + if (!vb2_is_streaming(&go->vidq)) { wake_up_interruptible(&go->frame_waitq); return; } @@ -804,7 +804,7 @@ static void go7007_usb_read_audio_pipe_complete(struct urb *urb) struct go7007 *go = (struct go7007 *)urb->context; int r, status = urb->status; - if (!go->streaming) + if (!vb2_is_streaming(&go->vidq)) return; if (status) { printk(KERN_ERR "go7007-usb: error in audio pipe: %d\n", @@ -1316,12 +1316,17 @@ static void go7007_usb_disconnect(struct usb_interface *intf) { struct go7007 *go = to_go7007(usb_get_intfdata(intf)); + mutex_lock(&go->queue_lock); + mutex_lock(&go->serialize_lock); + if (go->audio_enabled) go7007_snd_remove(go); go->status = STATUS_SHUTDOWN; v4l2_device_disconnect(&go->v4l2_dev); video_unregister_device(go->video_dev); + mutex_unlock(&go->serialize_lock); + mutex_unlock(&go->queue_lock); v4l2_device_put(&go->v4l2_dev); } |