[PATCH 10/10] bkl: Fix-up compile problems as a result of the bkl-pushdown.

John Kacur
2010-04-27T09:19:21Z

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