---

yaml
---
r: 40303
b: refs/heads/master
c: 85abb3f
h: refs/heads/master
i:
  40301: 0ff3660
  40299: d450dfe
  40295: 92cc009
  40287: c317b24
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24f73c92a990ecd3d1bb846267780a264d830065
+refs/heads/master: 85abb3f95010b277a6efbc9b8031a7854af87e10

trunk/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);