summaryrefslogtreecommitdiff
path: root/linux/lock.c
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2000-09-10 16:16:41 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2000-09-10 16:16:41 +0000
commit83253109dc9400daece9111d9a832587ce3690ed (patch)
treeb2e00dc30602554c500ddf53ca603d7eb3f8b252 /linux/lock.c
parenta5c98c730f6a865f0fb457103bfeb6dad5b82045 (diff)
Sync with 2.4.0-test8 kernel.ati-4-1-1-20000919-stable
Diffstat (limited to 'linux/lock.c')
-rw-r--r--linux/lock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/lock.c b/linux/lock.c
index 33b2cc03..e5fd435f 100644
--- a/linux/lock.c
+++ b/linux/lock.c
@@ -218,7 +218,8 @@ int drm_finish(struct inode *inode, struct file *filp, unsigned int cmd,
DRM_DEBUG("\n");
- copy_from_user_ret(&lock, (drm_lock_t *)arg, sizeof(lock), -EFAULT);
+ if (copy_from_user(&lock, (drm_lock_t *)arg, sizeof(lock)))
+ return -EFAULT;
ret = drm_flush_block_and_flush(dev, lock.context, lock.flags);
drm_flush_unblock(dev, lock.context, lock.flags);
return ret;