aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_ioc32.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 0e6ae9ceceb6..7101b5141f00 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -951,6 +951,7 @@ static struct {
951long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 951long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
952{ 952{
953 unsigned int nr = DRM_IOCTL_NR(cmd); 953 unsigned int nr = DRM_IOCTL_NR(cmd);
954 struct drm_file *file_priv = filp->private_data;
954 drm_ioctl_compat_t *fn; 955 drm_ioctl_compat_t *fn;
955 int ret; 956 int ret;
956 957
@@ -965,19 +966,14 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
965 if (!fn) 966 if (!fn)
966 return drm_ioctl(filp, cmd, arg); 967 return drm_ioctl(filp, cmd, arg);
967 968
968 if (drm_compat_ioctls[nr].name) { 969 DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
969 struct drm_file *file_priv = filp->private_data; 970 task_pid_nr(current),
970 DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n", 971 (long)old_encode_dev(file_priv->minor->kdev->devt),
971 task_pid_nr(current), 972 file_priv->authenticated,
972 (long)old_encode_dev(file_priv->minor->kdev->devt), 973 drm_compat_ioctls[nr].name);
973 file_priv->authenticated, 974 ret = (*fn)(filp, cmd, arg);
974 drm_compat_ioctls[nr].name); 975 if (ret)
975 ret = (*fn) (filp, cmd, arg); 976 DRM_DEBUG("ret = %d\n", ret);
976 if (ret)
977 DRM_DEBUG("ret = %d\n", ret);
978 } else {
979 ret = (*fn) (filp, cmd, arg);
980 }
981 return ret; 977 return ret;
982} 978}
983EXPORT_SYMBOL(drm_compat_ioctl); 979EXPORT_SYMBOL(drm_compat_ioctl);