From f89a576aece919f2f9bd42b7d36a5df62cb0d68e Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sat, 19 Aug 2006 16:31:34 +1000 Subject: 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 Signed-off-by: Dave Airlie --- linux-core/i830_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-core/i830_dma.c') 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; -- cgit v1.2.3