summaryrefslogtreecommitdiff
path: root/linux-core/i830_dma.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-08-19 16:31:34 +1000
committerDave Airlie <airlied@linux.ie>2006-08-28 11:26:57 +1000
commit27c72b67eceec7517c34d2ca456c7474a353d6e6 (patch)
tree297cba660f7b0c4a60c06920f5c09505de03065c /linux-core/i830_dma.c
parentb99e332236ca5fcc11e8d7c89566bbf3bcf959ee (diff)
drm: i810_dma.c: fix pointer arithmetic for 64-bit target
First warning result from open-coded PTR_ERR, the rest is caused by code like this: *(u32 *) ((u32) buf_priv->kernel_virtual + used) I've also fixed a missing PTR_ERR in i830_dma.c From: Denis Vlasenko <vda.linux@googlemail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'linux-core/i830_dma.c')
-rw-r--r--linux-core/i830_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index a122898b..9694f64a 100644
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -155,7 +155,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");
- retcode = virtual;
+ retcode = PTR_ERR((void *)virtual);
buf_priv->virtual = NULL;
} else {
buf_priv->virtual = (void __user *)virtual;