summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/videodev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-09-11 14:49:19 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-11 14:49:19 +0200
commit4b07c7ec71410a0f8c68befcfdfbdc0978edb140 (patch)
tree76d83cc0b6d9c3918ebc5a74d56971ee41d9f0d7 /linux/drivers/media/video/videodev.c
parent8b657d35d1e2378d68ff5b6108e302cad4be7b5a (diff)
downloadmediapointer-dvb-s2-4b07c7ec71410a0f8c68befcfdfbdc0978edb140.tar.gz
mediapointer-dvb-s2-4b07c7ec71410a0f8c68befcfdfbdc0978edb140.tar.bz2
Copy-paste bug in videodev.c
This patch fixes a copy-paste bug in videodev.c where the vidioc_qbuf() function gets called for the dqbuf ioctl. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/videodev.c')
-rw-r--r--linux/drivers/media/video/videodev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c
index b5fd2eabf..4b5a044db 100644
--- a/linux/drivers/media/video/videodev.c
+++ b/linux/drivers/media/video/videodev.c
@@ -758,13 +758,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
case VIDIOC_DQBUF:
{
struct v4l2_buffer *p=arg;
- if (!vfd->vidioc_qbuf)
+ if (!vfd->vidioc_dqbuf)
break;
ret = check_fmt (vfd, p->type);
if (ret)
break;
- ret=vfd->vidioc_qbuf(file, fh, p);
+ ret=vfd->vidioc_dqbuf(file, fh, p);
if (!ret)
dbgbuf(cmd,vfd,p);
break;