Merge with DRI CVS tree: handle lack of AGP gracefully.

e6101d76 · Linus Torvalds · 46fe1abc · e6101d76
Commit e6101d76 authored Nov 14, 2002 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/char/drm/drm_vm.h drivers/char/drm/drm_vm.h +1 -1

No files found.
--- a/drivers/char/drm/drm_vm.h
+++ b/drivers/char/drm/drm_vm.h
@@ -71,7 +71,7 @@ struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
         * Find the right map
         */

-	if(!dev->agp->cant_use_aperture) goto vm_nopage_error;
+	if(!dev->agp || !dev->agp->cant_use_aperture) goto vm_nopage_error;

 	list_for_each(list, &dev->maplist->head) {
 		r_list = (drm_map_list_t *)list;