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

uvc: fix dqueue ioctl may hold on forever when sensor is dead

Browse Source
This commit is contained in:
ddl
2011-07-21 10:45:27 +08:00
parent 194bd0355a
commit 4a915cc59b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -301,10 +301,15 @@ static int uvc_queue_waiton(struct uvc_buffer *buf, int nonblocking)
buf->state != UVC_BUF_STATE_ACTIVE)
? 0 : -EAGAIN;
}
#if 0
return wait_event_interruptible(buf->wait,
buf->state != UVC_BUF_STATE_QUEUED &&
buf->state != UVC_BUF_STATE_ACTIVE);
#else
/* ddl@rock-chips.com: wait_event_interruptible -> wait_event_interruptible_timeout */
return wait_event_interruptible_timeout(buf->wait,
(buf->state != UVC_BUF_STATE_QUEUED && buf->state != UVC_BUF_STATE_ACTIVE),msecs_to_jiffies(800));
#endif
}
/*
@@ -354,8 +359,16 @@ checks:
}
buf = list_first_entry(&queue->mainqueue, struct uvc_buffer, stream);
if ((ret = uvc_queue_waiton(buf, nonblocking)) < 0)
if ((ret = uvc_queue_waiton(buf, nonblocking)) <= 0) {
/* ddl@rock-chips.com: It is timeout */
if (ret == 0) {
ret = -EINVAL;
printk(KERN_ERR "uvcvideo: uvc_dequeue_buffer is timeout!!");
} else {
printk(KERN_ERR "uvcvideo: uvc_dequeue_buffer is failed!!(ret:%d)",ret);
}
goto done;
}
uvc_trace(UVC_TRACE_CAPTURE, "Dequeuing buffer %u (%u, %u bytes).\n",
buf->buf.index, buf->state, buf->buf.bytesused);