summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-08-17 10:48:38 +0000
committerDave Airlie <airlied@linux.ie>2005-08-17 10:48:38 +0000
commit7779659390afc5608655e617aa3f2c88b7e071c5 (patch)
treef88cf62826a01bf3e4e2180517b107a60d604de8
parent279e7c113ced4f2f4dcc14801aa3084698a417bd (diff)
revert reversion of a part of a patch from Jon, that I did last night while
checking things in in my sleep
-rw-r--r--linux-core/drm_bufs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_bufs.c b/linux-core/drm_bufs.c
index bad02f2d..d10973c7 100644
--- a/linux-core/drm_bufs.c
+++ b/linux-core/drm_bufs.c
@@ -56,7 +56,8 @@ static drm_local_map_t *drm_find_matching_map(drm_device_t *dev,
list_for_each(list, &dev->maplist->head) {
drm_map_list_t *entry = list_entry(list, drm_map_list_t, head);
if (entry->map && map->type == entry->map->type &&
- entry->map->offset == map->offset) {
+ ((entry->map->offset == map->offset) ||
+ (map->type == _DRM_SHM))) {
return entry->map;
}
}