diff --git a/[refs] b/[refs] index 841530aa8f65..c61ebf01fe2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ab6b267e5684452e229c58f4a5ba9f267866d42 +refs/heads/master: c93a5c34887426daa70f3caf05881fafb1cd687f diff --git a/trunk/drivers/media/video/videodev.c b/trunk/drivers/media/video/videodev.c index edd7b83c3464..2299e294e8df 100644 --- a/trunk/drivers/media/video/videodev.c +++ b/trunk/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;