shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

uvc : fix close uvc video device error

Browse Source
This commit is contained in:
ddl
2012-09-28 16:55:08 +08:00
parent f59c777749
commit b0da7311bf
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/uvc/uvc_queue.c
View File

@@ -349,6 +349,11 @@ int uvc_dequeue_buffer(struct uvc_video_queue *queue,
v4l2_buf->memory);
return -EINVAL;
}
/* ddl@rock-chips.com */
if (!(queue->flags & UVC_QUEUE_STREAMING)) {
printk("uvcvideo: Not streaming\n");
return -EINVAL;
}
mutex_lock(&queue->mutex);
/* ddl@rock-chips.com : This design copied from video-buf */
@@ -371,8 +376,10 @@ checks:
((!list_empty(&queue->mainqueue)) || (!(queue->flags & UVC_QUEUE_STREAMING))));
mutex_lock(&queue->mutex);
if (ret || (!(queue->flags & UVC_QUEUE_STREAMING)))
goto done;
if (ret || (!(queue->flags & UVC_QUEUE_STREAMING))) {
printk("uvcvideo: Stream off\n");
goto done;
}
goto checks;
}
@@ -592,6 +599,7 @@ int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
queue->flags |= UVC_QUEUE_STREAMING;
queue->buf_used = 0;
} else {
queue->flags &= ~UVC_QUEUE_STREAMING;
uvc_queue_cancel(queue, 0);
INIT_LIST_HEAD(&queue->mainqueue);
@@ -599,8 +607,6 @@ int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
queue->buffer[i].error = 0;
queue->buffer[i].state = UVC_BUF_STATE_IDLE;
}
queue->flags &= ~UVC_QUEUE_STREAMING;
}
done:

15
drivers/media/video/uvc/uvc_video.c
View File

@@ -898,7 +898,7 @@ static void uvc_uninit_video(struct uvc_streaming *stream, int free_buffers)
{
struct urb *urb;
unsigned int i;
for (i = 0; i < UVC_URBS; ++i) {
urb = stream->urb[i];
if (urb == NULL)
@@ -1312,11 +1312,14 @@ int uvc_video_init(struct uvc_streaming *stream)
int uvc_video_enable(struct uvc_streaming *stream, int enable)
{
int ret;
if (!enable) {
uvc_uninit_video(stream, 1);
usb_set_interface(stream->dev->udev, stream->intfnum, 0);
uvc_queue_enable(&stream->queue, 0);
if (stream->flags & UVC_QUEUE_STREAMING) { /* ddl@rock-chips.com */
uvc_queue_enable(&stream->queue, 0);
uvc_uninit_video(stream, 1);
usb_set_interface(stream->dev->udev, stream->intfnum, 0);
stream->flags &= ~UVC_QUEUE_STREAMING;
}
return 0;
}
@@ -1330,7 +1333,7 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
uvc_queue_enable(&stream->queue, 0);
return ret;
}
stream->flags |= UVC_QUEUE_STREAMING;
return uvc_init_video(stream, GFP_KERNEL);
}

1
drivers/media/video/uvc/uvcvideo.h
View File

@@ -501,6 +501,7 @@ struct uvc_streaming {
__u8 last_fid;
struct tasklet_struct *tasklet[UVC_URBS]; /* ddl@rock-chips.com */
unsigned int flags;
};
enum uvc_device_state {