From: Gerd Knorr <kraxel@bytesex.org>
Minor tweak in the v4l1 compatibility layer: Make sure that capture actually
is active before going to wait for a frame so we don't block forever.
---
25-akpm/drivers/media/video/v4l1-compat.c | 15 +++++++++++----
25-akpm/include/linux/videodev.h | 1 +
2 files changed, 12 insertions(+), 4 deletions(-)
diff -puN drivers/media/video/v4l1-compat.c~v4l-v4l1-compat-fix drivers/media/video/v4l1-compat.c
--- 25/drivers/media/video/v4l1-compat.c~v4l-v4l1-compat-fix Mon Apr 5 14:46:05 2004
+++ 25-akpm/drivers/media/video/v4l1-compat.c Mon Apr 5 14:46:05 2004
@@ -289,6 +289,7 @@ v4l_compat_translate_ioctl(struct inode
{
struct v4l2_capability *cap2 = NULL;
struct v4l2_format *fmt2 = NULL;
+ enum v4l2_buf_type captype = V4L2_BUF_TYPE_VIDEO_CAPTURE;
struct v4l2_framebuffer fbuf2;
struct v4l2_input input2;
@@ -465,6 +466,7 @@ v4l_compat_translate_ioctl(struct inode
fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
memset(fmt2,0,sizeof(*fmt2));
fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type);
err1 = drv(inode, file, VIDIOC_G_FMT, fmt2);
if (err1 < 0)
dprintk("VIDIOCSWIN / VIDIOC_G_FMT: %d\n",err);
@@ -503,11 +505,10 @@ v4l_compat_translate_ioctl(struct inode
int *on = arg;
if (0 == *on) {
- enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
/* dirty hack time. But v4l1 has no STREAMOFF
* equivalent in the API, and this one at
* least comes close ... */
- drv(inode, file, VIDIOC_STREAMOFF, &type);
+ drv(inode, file, VIDIOC_STREAMOFF, &captype);
}
err = drv(inode, file, VIDIOC_OVERLAY, arg);
if (err < 0)
@@ -858,7 +859,6 @@ v4l_compat_translate_ioctl(struct inode
case VIDIOCMCAPTURE: /* capture a frame */
{
struct video_mmap *mm = arg;
- enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
fmt2 = kmalloc(sizeof(*fmt2),GFP_KERNEL);
memset(&buf2,0,sizeof(buf2));
@@ -899,7 +899,7 @@ v4l_compat_translate_ioctl(struct inode
dprintk("VIDIOCMCAPTURE / VIDIOC_QBUF: %d\n",err);
break;
}
- err = drv(inode, file, VIDIOC_STREAMON, &type);
+ err = drv(inode, file, VIDIOC_STREAMON, &captype);
if (err < 0)
dprintk("VIDIOCMCAPTURE / VIDIOC_STREAMON: %d\n",err);
break;
@@ -922,6 +922,13 @@ v4l_compat_translate_ioctl(struct inode
break;
}
+ /* make sure capture actually runs so we don't block forever */
+ err = drv(inode, file, VIDIOC_STREAMON, &captype);
+ if (err < 0) {
+ dprintk("VIDIOCSYNC / VIDIOC_STREAMON: %d\n",err);
+ break;
+ }
+
/* Loop as long as the buffer is queued, but not done */
while ((buf2.flags &
(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE))
diff -puN include/linux/videodev.h~v4l-v4l1-compat-fix include/linux/videodev.h
--- 25/include/linux/videodev.h~v4l-v4l1-compat-fix Mon Apr 5 14:46:05 2004
+++ 25-akpm/include/linux/videodev.h Mon Apr 5 14:46:05 2004
@@ -430,6 +430,7 @@ struct video_code
#define VID_HARDWARE_VICAM 34
#define VID_HARDWARE_SF16FMR2 35
#define VID_HARDWARE_W9968CF 36
+#define VID_HARDWARE_SAA7114H 37
#endif /* __LINUX_VIDEODEV_H */
/*
_