diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 09:55:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-26 09:55:39 -0700 |
| commit | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (patch) | |
| tree | 2c8306b2742aeac49048792ec21c9996bf3622bf /drivers/char/drm/drm_context.c | |
| parent | bf82322ec5d5faa8bfd8f163909244d8c6b562d5 (diff) | |
| parent | 9a18664506dbce5e23f3c5de7b1c5a042dd26520 (diff) | |
Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/drm_context.c')
| -rw-r--r-- | drivers/char/drm/drm_context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/drm/drm_context.c b/drivers/char/drm/drm_context.c index f15c86c5787..fdf661f234e 100644 --- a/drivers/char/drm/drm_context.c +++ b/drivers/char/drm/drm_context.c @@ -225,7 +225,7 @@ int drm_getsareactx(struct inode *inode, struct file *filp, map = dev->context_sareas[request.ctx_id]; up(&dev->struct_sem); - request.handle = map->handle; + request.handle = (void *) map->offset; if (copy_to_user(argp, &request, sizeof(request))) return -EFAULT; return 0; @@ -261,8 +261,8 @@ int drm_setsareactx(struct inode *inode, struct file *filp, down(&dev->struct_sem); list_for_each(list, &dev->maplist->head) { r_list = list_entry(list, drm_map_list_t, head); - if(r_list->map && - r_list->map->handle == request.handle) + if (r_list->map + && r_list->map->offset == (unsigned long) request.handle) goto found; } bad: |