Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / uvc / uvc_v4l2.c

diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c
index 8cf61e8a634ffeb7cb23bfe004efc2c60053f1e8..9005a8d9d5f8fe8f90c8aa5788c7d2109ff72951 100644 (file)
--- a/drivers/media/video/uvc/uvc_v4l2.c
+++ b/drivers/media/video/uvc/uvc_v4l2.c
@@ -1035,11 +1035,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                return uvc_xu_ctrl_query(chain, arg, 1);
 
        default:
-               if ((ret = v4l_compat_translate_ioctl(file, cmd, arg,
-                       uvc_v4l2_do_ioctl)) == -ENOIOCTLCMD)
-                       uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n",
-                                 cmd);
-               return ret;
+               uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n", cmd);
+               return -EINVAL;
        }
 
        return ret;