Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: ioremap return value checks
drm/via: Fix dmablit when blit queue is full
drm_rmmap_ioctl(): remove dead code
+8
-7
+7
-6
drivers/char/drm/drm_bufs.c
+7
-6
drivers/char/drm/drm_bufs.c
···
177
177
MTRR_TYPE_WRCOMB, 1);
178
178
}
179
179
}
180
-
if (map->type == _DRM_REGISTERS)
180
+
if (map->type == _DRM_REGISTERS) {
181
181
map->handle = ioremap(map->offset, map->size);
182
+
if (!map->handle) {
183
+
drm_free(map, sizeof(*map), DRM_MEM_MAPS);
184
+
return -ENOMEM;
185
+
}
186
+
}
187
+
182
188
break;
183
189
case _DRM_SHM:
184
190
list = drm_find_matching_map(dev, map);
···
481
475
* find anything.
482
476
*/
483
477
if (list_empty(&dev->maplist) || !map) {
484
-
mutex_unlock(&dev->struct_mutex);
485
-
return -EINVAL;
486
-
}
487
-
488
-
if (!map) {
489
478
mutex_unlock(&dev->struct_mutex);
490
479
return -EINVAL;
491
480
}
+1
-1
drivers/char/drm/via_dmablit.c
+1
-1
drivers/char/drm/via_dmablit.c