summaryrefslogtreecommitdiff
path: root/linux-core/sis_mm.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-07-19 17:00:17 -0700
committerEric Anholt <eric@anholt.net>2007-07-20 12:53:52 -0700
commite39286eb5eab8846a228863abf8f1b8b07a9e29d (patch)
tree7f0f599e514917546e195f2ec19eb869deb141c1 /linux-core/sis_mm.c
parent5dc9fd96d7bf48003db832f145ad8acb4bcb73b4 (diff)
Remove DRM_ERR OS macro.
This was used to make all ioctl handlers return -errno on linux and errno on *BSD. Instead, just return -errno in shared code, and flip sign on return from shared code to *BSD code.
Diffstat (limited to 'linux-core/sis_mm.c')
-rw-r--r--linux-core/sis_mm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/sis_mm.c b/linux-core/sis_mm.c
index edbf8bf4..f9c7a7e2 100644
--- a/linux-core/sis_mm.c
+++ b/linux-core/sis_mm.c
@@ -139,7 +139,7 @@ static int sis_drm_alloc(struct drm_device * dev, struct drm_file * priv,
dev_priv->agp_initialized)) {
DRM_ERROR
("Attempt to allocate from uninitialized memory manager.\n");
- return DRM_ERR(EINVAL);
+ return -EINVAL;
}
mem.size = (mem.size + SIS_MM_ALIGN_MASK) >> SIS_MM_ALIGN_SHIFT;
@@ -158,7 +158,7 @@ static int sis_drm_alloc(struct drm_device * dev, struct drm_file * priv,
mem.offset = 0;
mem.size = 0;
mem.free = 0;
- retval = DRM_ERR(ENOMEM);
+ retval = -ENOMEM;
}
DRM_COPY_TO_USER_IOCTL(argp, mem, sizeof(mem));