diff options
author | Thierry MERLE <thierry.merle@free.fr> | 2006-12-04 08:31:04 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-10 09:05:41 -0200 |
commit | c8400c700723936d9333c977e51fa77062d26dd4 (patch) | |
tree | 24d1f234c3fb67d3e58c21dbf0a7c975aa0db23a /drivers/media/video/usbvision/usbvision-core.c | |
parent | 6714b01263b06b2e7d054625486451a9fd8e03f4 (diff) |
V4L/DVB (4924): Fix some bugs on usbvision due to the merge into one module
Found the bug that prevented the driver from loading : a module
param conflict between usbvision-i2c and usbvision-core (debug
parameter).
- correct the module param "debug" conflics in usbvision-i2c.c and
usbvision-core.c
- add some debug printouts in usbvision-core.c VDIOC_QBUF/VIDIOC_DQBUF
- usbvision-core.c : add vb->field = V4L2_FIELD_NONE in VIDIOC_DQBUF
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index a23fcd15a1d..da422e7793a 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c @@ -4240,6 +4240,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, /* set v4l2_format index */ frame->v4l2_format = usbvision->palette; + PDEBUG(DBG_IOCTL, "VIDIOC_QBUF frame=%d",vb->index); return usbvision_new_frame(usbvision, vb->index); } @@ -4269,8 +4270,8 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, if (vb->index == -1) return -EINVAL; - PDEBUG(DBG_IOCTL, "VIDIOC_DQBUF frame=%d, grabstate=%d", - vb->index, usbvision->frame[vb->index].grabstate); + PDEBUG(DBG_IOCTL, "VIDIOC_DQBUF frame=%d, grabstate=%d, curframeNum=%d", + vb->index, usbvision->frame[vb->index].grabstate,usbvision->curFrameNum); switch (usbvision->frame[vb->index].grabstate) { case FrameState_Unused: @@ -4295,6 +4296,7 @@ static int usbvision_v4l2_do_ioctl(struct inode *inode, struct file *file, errCode = (usbvision->frame[vb->index].grabstate == FrameState_Error) ? -EIO : 0; vb->memory = V4L2_MEMORY_MMAP; vb->flags = V4L2_BUF_FLAG_MAPPED | V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE; + vb->field = V4L2_FIELD_NONE; vb->sequence = usbvision->frame[vb->index].sequence; usbvision->frame[vb->index].grabstate = FrameState_Unused; break; |