From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 11 Sep 2006 12:49:19 +0000 (-0300)
Subject: V4L/DVB (4622): Copy-paste bug in videodev.c
X-Git-Tag: v2.6.19-rc1~643^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c93a5c34887426daa70f3caf05881fafb1cd687f;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index edd7b83c346..2299e294e8d 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,
 	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;