Revert "drm: ioremap balanced with iounmap for drivers/char/drm"
authorDave Airlie <airlied@optimus.localdomain>
Tue, 19 Dec 2006 05:44:57 +0000 (16:44 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 05:44:57 +0000 (16:44 +1100)
This reverts cc22cd8bde39f3e4be8ca9f726a773b0270ebdbc commit.

I put this patch incorrectly in .. will fix now

linux-core/drm_bufs.c

index 1ff7c90..d6ebc8d 100644 (file)
@@ -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);