summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2006-08-27 03:09:46 +0200
committerDave Airlie <airlied@linux.ie>2006-09-21 21:32:33 +0200
commit46acbf13fb280e69c5cafe7c837d5a27c6e380c3 (patch)
tree4ebc937d60c6132af73202bb57a1540474617aa9 /drivers/char/drm
parentdrm: realign sosme radeon code with drm git tree (diff)
downloadlinux-46acbf13fb280e69c5cafe7c837d5a27c6e380c3.tar.xz
linux-46acbf13fb280e69c5cafe7c837d5a27c6e380c3.zip
drm: fixup i915 error codes
Frederik Deweerdt <deweerdt@free.fr> pointed this out, I fixed a missing DRM error wrapper also. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r--drivers/char/drm/i915_dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index d932f80f264c..a7924e28a847 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -260,7 +260,7 @@ static int i915_dma_init(DRM_IOCTL_ARGS)
retcode = i915_dma_resume(dev);
break;
default:
- retcode = -EINVAL;
+ retcode = DRM_ERR(EINVAL);
break;
}
@@ -391,7 +391,7 @@ static int i915_emit_box(drm_device_t * dev,
RING_LOCALS;
if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) {
- return EFAULT;
+ return DRM_ERR(EFAULT);
}
if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) {