git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
char
/
drm
/
i830_dma.c
diff --git
a/drivers/char/drm/i830_dma.c
b/drivers/char/drm/i830_dma.c
index
b0f815d
..
4f0e574
100644
(file)
--- a/
drivers/char/drm/i830_dma.c
+++ b/
drivers/char/drm/i830_dma.c
@@
-108,7
+108,7
@@
static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
unlock_kernel();
if (io_remap_pfn_range(vma, vma->vm_start,
unlock_kernel();
if (io_remap_pfn_range(vma, vma->vm_start,
-
VM_OFFSET(vma) >> PAGE_SHIFT
,
+
vma->vm_pgoff
,
vma->vm_end - vma->vm_start, vma->vm_page_prot))
return -EAGAIN;
return 0;
vma->vm_end - vma->vm_start, vma->vm_page_prot))
return -EAGAIN;
return 0;
@@
-146,7
+146,7
@@
static int i830_map_buffer(drm_buf_t * buf, struct file *filp)
if (IS_ERR((void *)virtual)) { /* ugh */
/* Real error */
DRM_ERROR("mmap error\n");
if (IS_ERR((void *)virtual)) { /* ugh */
/* Real error */
DRM_ERROR("mmap error\n");
- retcode =
virtual
;
+ retcode =
PTR_ERR((void *)virtual)
;
buf_priv->virtual = NULL;
} else {
buf_priv->virtual = (void __user *)virtual;
buf_priv->virtual = NULL;
} else {
buf_priv->virtual = (void __user *)virtual;