[PATCH 10/10] bkl: Fix-up compile problems as a result of the bkl-pushdown.
in [Kernel]
|
Prev: [PATCH 05/10] bkl: Fix missing inode in twl_chrdev_ioctl resulting from bkl pushdown
Next: [PATCH 03/10] bkl: Fix up compile problems in megaraid from bkl push-down
From: John Kacur on 27 Apr 2010 05:30 Fix-up compile problems as a result of the bkl-pushdown. In particular, the v4l2_ioctl should call an unlocked_ioctl Signed-off-by: John Kacur <jkacur(a)redhat.com> --- drivers/media/video/v4l2-dev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 3606694..8fbfa61 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -222,12 +222,12 @@ static long v4l2_ioctl(struct file *filp, struct video_device *vdev = video_devdata(filp); int ret; - if (!vdev->fops->ioctl) + if (!vdev->fops->unlocked_ioctl) return -ENOTTY; /* Allow ioctl to continue even if the device was unregistered. Things like dequeueing buffers might still be useful. */ lock_kernel(); - ret = vdev->fops->ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg); + ret = vdev->fops->unlocked_ioctl(filp, cmd, arg); unlock_kernel(); return ret; -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |