diff options
| author | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-09-14 14:47:13 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@fairlite.demon.co.uk> | 2000-09-14 14:47:13 +0000 |
| commit | c68634b2d39c79ff22bdec189dfa77fb5bb9cbed (patch) | |
| tree | 2929cbe196c4fc765f64852512a1b57eb401b0db /linux/lock.c | |
| parent | 68380d1373cf7b01a6ae5c9440de7a52745af091 (diff) | |
Sync up with head branch & 2.4.0-test8 kerneltdfx-2-1-branch
Diffstat (limited to 'linux/lock.c')
| -rw-r--r-- | linux/lock.c | 3 |
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; |