[haiku-commits] r37016 - haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 5 Jun 2010 04:10:14 +0200 (CEST)

Author: anevilyak
Date: 2010-06-05 04:10:14 +0200 (Sat, 05 Jun 2010)
New Revision: 37016
Changeset: http://dev.haiku-os.org/changeset/37016/haiku
Ticket: http://dev.haiku-os.org/ticket/6137

Modified:
   
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
Log:
The physical base pointer can be NULL since it's only allocated if certain 
flags are passed. Fixes regression introduced in r36999 and hopefully ticket 
#6137. Axel, please review.



Modified: 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp
===================================================================
--- 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp 
    2010-06-04 23:04:09 UTC (rev 37015)
+++ 
haiku/trunk/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp 
    2010-06-05 02:10:14 UTC (rev 37016)
@@ -170,7 +170,8 @@
        phys_addr_t physicalBase;
        status_t error = gGART->allocate_memory(info.aperture, size, alignment,
                flags, _base, &physicalBase);
-       *_physicalBase = physicalBase;
+       if (_physicalBase != NULL)
+               *_physicalBase = physicalBase;
        return error;
 }
 


Other related posts: