diff options
| author | Amol Lad <amol@verismonetworks.com> | 2006-10-25 09:55:34 -0700 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-10-25 09:55:34 -0700 |
| commit | 85abb3f95010b277a6efbc9b8031a7854af87e10 (patch) | |
| tree | ede2f4e49d1bde65e8e12e7e919af2a179c9a613 /drivers/char | |
| parent | 24f73c92a990ecd3d1bb846267780a264d830065 (diff) | |
| download | op-kernel-dev-85abb3f95010b277a6efbc9b8031a7854af87e10.zip op-kernel-dev-85abb3f95010b277a6efbc9b8031a7854af87e10.tar.gz | |
drm: ioremap balanced with iounmap for drivers/char/drm
ioremap must be balanced by an iounmap and failing to do so can result
in a memory leak.
Tested (compilation only) to make sure the files are compiling without
any warning/error due to new changes
Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/drm/drm_bufs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c index 029baea..6eafff1 100644 --- a/drivers/char/drm/drm_bufs.c +++ b/drivers/char/drm/drm_bufs.c @@ -237,6 +237,8 @@ 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_ioremapfree(map->handle, map->size, dev); drm_free(map, sizeof(*map), DRM_MEM_MAPS); return -EINVAL; } @@ -252,6 +254,8 @@ static int drm_addmap_core(drm_device_t * dev, unsigned int offset, map->offset; ret = drm_map_handle(dev, &list->hash, user_token, 0); if (ret) { + if (map->type == _DRM_REGISTERS) + drm_ioremapfree(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); |
