diff options
author | Dave Airlie <airlied@linux.ie> | 2006-08-26 21:09:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-09-21 15:32:33 -0400 |
commit | 46acbf13fb280e69c5cafe7c837d5a27c6e380c3 (patch) | |
tree | 4ebc937d60c6132af73202bb57a1540474617aa9 | |
parent | b15ec36806ce3b89a2fddce958de9370efb249da (diff) |
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>
-rw-r--r-- | drivers/char/drm/i915_dma.c | 4 |
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) | |||
260 | retcode = i915_dma_resume(dev); | 260 | retcode = i915_dma_resume(dev); |
261 | break; | 261 | break; |
262 | default: | 262 | default: |
263 | retcode = -EINVAL; | 263 | retcode = DRM_ERR(EINVAL); |
264 | break; | 264 | break; |
265 | } | 265 | } |
266 | 266 | ||
@@ -391,7 +391,7 @@ static int i915_emit_box(drm_device_t * dev, | |||
391 | RING_LOCALS; | 391 | RING_LOCALS; |
392 | 392 | ||
393 | if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) { | 393 | if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) { |
394 | return EFAULT; | 394 | return DRM_ERR(EFAULT); |
395 | } | 395 | } |
396 | 396 | ||
397 | if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) { | 397 | if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) { |