diff options
| author | Pekka Paalanen <pq@iki.fi> | 2007-07-21 23:13:25 +0300 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2007-07-21 23:13:25 +0300 |
| commit | 0844c46759b96d52c4952fceb96f7c6bb74b2ce7 (patch) | |
| tree | 2c435b4215175d7d766d3ea031431c7a42844664 /linux-core/drm_bufs.c | |
| parent | b43b0b2b32a31bcb81042659ffcc95b8975e42cf (diff) | |
Fix misc ioctl issues, makes Nouveau run.
Debug print fix in drm_release().
Forgotten local variable init in drm_setversion().
Unnecessary put_user() in drm_addmap_ioctl().
ioctl->cmd check broken in drm_ioctl(); workaround.
Diffstat (limited to 'linux-core/drm_bufs.c')
| -rw-r--r-- | linux-core/drm_bufs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c index e8864df0..665bc65d 100644 --- a/linux-core/drm_bufs.c +++ b/linux-core/drm_bufs.c @@ -343,8 +343,7 @@ int drm_addmap_ioctl(struct drm_device *dev, void *data, return err; /* avoid a warning on 64-bit, this casting isn't very nice, but the API is set so too late */ - if (put_user((void *)(unsigned long)maplist->user_token, &map->handle)) - return -EFAULT; + map->handle = (void *)(unsigned long)maplist->user_token; return 0; } |