From 5003f66a4c18cc3e86be170fdf604a45c02bf6df Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 5 Jun 2010 02:10:14 +0000 Subject: [PATCH] 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. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37016 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/drivers/graphics/intel_extreme/intel_extreme.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp index 856aeae275..573d9d1666 100644 --- a/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp +++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/intel_extreme.cpp @@ -170,7 +170,8 @@ intel_allocate_memory(intel_info &info, size_t size, size_t alignment, 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; }