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_irq.c | |
| parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) | |
| download | kernel_samsung_tuna-3d77461ecd7fb92bb888f69478e3518b3c947ce3.zip kernel_samsung_tuna-3d77461ecd7fb92bb888f69478e3518b3c947ce3.tar.gz kernel_samsung_tuna-3d77461ecd7fb92bb888f69478e3518b3c947ce3.tar.bz2 | |
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_irq.c')
| -rw-r--r-- | drivers/char/drm/drm_irq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c index ebdb718..8e484d2 100644 --- a/drivers/char/drm/drm_irq.c +++ b/drivers/char/drm/drm_irq.c @@ -255,7 +255,8 @@ int drm_wait_vblank(DRM_IOCTL_ARGS) if (!dev->irq) return -EINVAL; - DRM_COPY_FROM_USER_IOCTL(vblwait, argp, sizeof(vblwait)); + if (copy_from_user(&vblwait, argp, sizeof(vblwait))) + return -EFAULT; switch (vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK) { case _DRM_VBLANK_RELATIVE: @@ -329,7 +330,8 @@ int drm_wait_vblank(DRM_IOCTL_ARGS) } done: - DRM_COPY_TO_USER_IOCTL(argp, vblwait, sizeof(vblwait)); + if (copy_to_user(argp, &vblwait, sizeof(vblwait))) + return -EFAULT; return ret; } |