diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2006-09-11 08:49:19 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 11:30:36 -0400 |
commit | c93a5c34887426daa70f3caf05881fafb1cd687f (patch) | |
tree | 3c0027e5fb46e96a691c70ef7f13ae6d331015fc /drivers/media/video/videodev.c | |
parent | 5ab6b267e5684452e229c58f4a5ba9f267866d42 (diff) |
V4L/DVB (4622): 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 'drivers/media/video/videodev.c')
-rw-r--r-- | drivers/media/video/videodev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index edd7b83c3464..2299e294e8df 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c | |||
@@ -739,13 +739,13 @@ static int __video_do_ioctl(struct inode *inode, struct file *file, | |||
739 | case VIDIOC_DQBUF: | 739 | case VIDIOC_DQBUF: |
740 | { | 740 | { |
741 | struct v4l2_buffer *p=arg; | 741 | struct v4l2_buffer *p=arg; |
742 | if (!vfd->vidioc_qbuf) | 742 | if (!vfd->vidioc_dqbuf) |
743 | break; | 743 | break; |
744 | ret = check_fmt (vfd, p->type); | 744 | ret = check_fmt (vfd, p->type); |
745 | if (ret) | 745 | if (ret) |
746 | break; | 746 | break; |
747 | 747 | ||
748 | ret=vfd->vidioc_qbuf(file, fh, p); | 748 | ret=vfd->vidioc_dqbuf(file, fh, p); |
749 | if (!ret) | 749 | if (!ret) |
750 | dbgbuf(cmd,vfd,p); | 750 | dbgbuf(cmd,vfd,p); |
751 | break; | 751 | break; |