summaryrefslogtreecommitdiff
path: root/linux/i810_dma.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-12-12 16:45:31 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-12-12 16:45:31 +0000
commit786228bd26d56c13fc2655431ee5ca2d4d0c9863 (patch)
treeaca4bc295550c9740a43ec763881986e0b55a553 /linux/i810_dma.c
parentfd621fd4a0c0033365353b6d33f132c7ef49b359 (diff)
bring in jantorial changes from 2.5.51
Diffstat (limited to 'linux/i810_dma.c')
-rw-r--r--linux/i810_dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/i810_dma.c b/linux/i810_dma.c
index 13f5f64f..ffb7c708 100644
--- a/linux/i810_dma.c
+++ b/linux/i810_dma.c
@@ -38,6 +38,7 @@
#include "i810_drv.h"
#include <linux/interrupt.h> /* For task queue support */
#include <linux/delay.h>
+#include <linux/pagemap.h>
#ifdef DO_MUNMAP_4_ARGS
#define DO_MUNMAP(m, a, l) do_munmap(m, a, l, 1)
@@ -1184,7 +1185,8 @@ int i810_ov0_info(struct inode *inode, struct file *filp,
data.offset = dev_priv->overlay_offset;
data.physical = dev_priv->overlay_physical;
- copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data));
+ if (copy_to_user((drm_i810_overlay_t *)arg,&data,sizeof(data)))
+ return -EFAULT;
return 0;
}