From c76e93b0013e74e27905974c006e5876b20fce1e Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Tue, 16 Dec 2008 08:32:37 -0300
Subject: [PATCH] --- yaml --- r: 120031 b: refs/heads/master c:
 3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19 h: refs/heads/master i:   120029:
 b6a4c8bce700a93a6eedf460c60eb320043a7f9a   120027:
 6f72b8d1009095c4d8481c5037894a9d9d15de14   120023:
 9fd5dfb23549f2a8cfb1a7b5bbdfc2bcc1223b7d   120015:
 9701ecdee341640af59b5f97296c9e0f2aa60ca9   119999:
 161b27bd93f471f294c638cab2c8bb782ea91047 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/video/compat_ioctl32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 765daf2eaff7..805feb8ee9fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b21c1e90e633aee3363e3d87e1a0b829bdb420e
+refs/heads/master: 3ca81a55256f38d9a8a4d5e9a6a9288ddc672e19
diff --git a/trunk/drivers/media/video/compat_ioctl32.c b/trunk/drivers/media/video/compat_ioctl32.c
index e6ca4012b5f0..0ea85a05e5c0 100644
--- a/trunk/drivers/media/video/compat_ioctl32.c
+++ b/trunk/drivers/media/video/compat_ioctl32.c
@@ -831,7 +831,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
 {
 	int ret = -ENOIOCTLCMD;
 
-	if (!file->f_op->ioctl)
+	if (!file->f_op->ioctl && !file->f_op->unlocked_ioctl)
 		return ret;
 
 	switch (cmd) {