diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-08-27 11:09:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-09-22 05:32:33 +1000 |
| commit | 46acbf13fb280e69c5cafe7c837d5a27c6e380c3 (patch) | |
| tree | 4ebc937d60c6132af73202bb57a1540474617aa9 /drivers | |
| parent | b15ec36806ce3b89a2fddce958de9370efb249da (diff) | |
| download | linux-stable-46acbf13fb280e69c5cafe7c837d5a27c6e380c3.tar.gz linux-stable-46acbf13fb280e69c5cafe7c837d5a27c6e380c3.tar.bz2 linux-stable-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')
| -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) 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) { |