diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-08-07 20:07:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:30 +1000 |
| commit | 3d77461ecd7fb92bb888f69478e3518b3c947ce3 (patch) | |
| tree | 8f5c01d7d50873e9361aa50a070f633bb77f838c /drivers/char/drm/drm_ioctl.c | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| download | op-kernel-dev-3d77461ecd7fb92bb888f69478e3518b3c947ce3.zip op-kernel-dev-3d77461ecd7fb92bb888f69478e3518b3c947ce3.tar.gz | |
drm: cleanup old compat code and DRM fns from Linux only code
This patch removes some of the old compatibility macros from the DRM,
and removes use of DRM wrappers from Linux specific code.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_ioctl.c')
| -rw-r--r-- | drivers/char/drm/drm_ioctl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c index 555f323..31dfe83 100644 --- a/drivers/char/drm/drm_ioctl.c +++ b/drivers/char/drm/drm_ioctl.c @@ -331,21 +331,23 @@ int drm_setversion(DRM_IOCTL_ARGS) int if_version; drm_set_version_t __user *argp = (void __user *)data; - DRM_COPY_FROM_USER_IOCTL(sv, argp, sizeof(sv)); + if (copy_from_user(&sv, argp, sizeof(sv))) + return -EFAULT; retv.drm_di_major = DRM_IF_MAJOR; retv.drm_di_minor = DRM_IF_MINOR; retv.drm_dd_major = dev->driver->major; retv.drm_dd_minor = dev->driver->minor; - DRM_COPY_TO_USER_IOCTL(argp, retv, sizeof(sv)); + if (copy_to_user(argp, &retv, sizeof(sv))) + return -EFAULT; if (sv.drm_di_major != -1) { if (sv.drm_di_major != DRM_IF_MAJOR || sv.drm_di_minor < 0 || sv.drm_di_minor > DRM_IF_MINOR) return EINVAL; if_version = DRM_IF_VERSION(sv.drm_di_major, sv.drm_di_minor); - dev->if_version = DRM_MAX(if_version, dev->if_version); + dev->if_version = max(if_version, dev->if_version); if (sv.drm_di_minor >= 1) { /* * Version 1.1 includes tying of DRM to specific device |
