summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@optimus.localdomain>2006-12-19 16:44:57 +1100
committerDave Airlie <airlied@linux.ie>2006-12-19 16:44:57 +1100
commit696f2bfbd1b6da73893bce082308a43878e6ab75 (patch)
treee008b6581b976b28b03a5c734e627520ca96c1e3 /linux-core
parentcc22cd8bde39f3e4be8ca9f726a773b0270ebdbc (diff)
Revert "drm: ioremap balanced with iounmap for drivers/char/drm"
This reverts cc22cd8bde39f3e4be8ca9f726a773b0270ebdbc commit. I put this patch incorrectly in .. will fix now
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_bufs.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index 1ff7c90b..d6ebc8d1 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -279,8 +279,6 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
list = drm_alloc(sizeof(*list), DRM_MEM_MAPS);
if (!list) {
- if (map->type == _DRM_REGISTERS)
- drm_ioremap(map->handle, map->size, dev);
drm_free(map, sizeof(*map), DRM_MEM_MAPS);
return -EINVAL;
}
@@ -297,8 +295,6 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset,
ret = drm_map_handle(dev, &list->hash, user_token, 0);
if (ret) {
- if (map->type == _DRM_REGISTERS)
- drm_ioremap(map->handle, map->size, dev);
drm_free(map, sizeof(*map), DRM_MEM_MAPS);
drm_free(list, sizeof(*list), DRM_MEM_MAPS);
mutex_unlock(&dev->struct_mutex);