diff options
| author | Jason Chen <b02280@freescale.com> | 2009-08-26 15:30:52 +0800 |
|---|---|---|
| committer | Jason Chen <b02280@freescale.com> | 2009-08-27 09:29:02 +0800 |
| commit | 1860b23e6aedae45d1ceb55c3600f84e0ebe4a4c (patch) | |
| tree | c96bba083bbb558a650e24912b51adeb57b9ee6e /drivers | |
| parent | 6aa64361af251ba7f1a9e8d3c666403401c5a26d (diff) | |
ENGR00115886 V4L capture: add non-block method support
Add non-block method support for v4l-capture driver.
Signed-off-by: Jason Chen <b02280@freescale.com>
(cherry picked from commit cd1eda4824d8bae150d01d1c2c1616510ecb80d0)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/mxc/capture/mxc_v4l2_capture.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c index 5e3bcc2ae19a..a05f4b896f34 100644 --- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c @@ -1694,6 +1694,12 @@ static int mxc_v4l_do_ioctl(struct inode *inode, struct file *file, struct v4l2_buffer *buf = arg; pr_debug(" case VIDIOC_DQBUF\n"); + if ((cam->enc_counter == 0) && + (file->f_flags & O_NONBLOCK)) { + retval = -EAGAIN; + break; + } + retval = mxc_v4l_dqueue(cam, buf); break; |