xf86-video-intel: src/i830_driver.c

[Eric Anholt]

 src/i830_driver.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 04f50961e2f1610c39e7e4b45811f2a6b517cad6 (from b07dfbba5df7728232b38211c623185116dcea5c)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Mar 6 14:23:06 2007 -0800

    Bug #9898: Fix a crash with NoAccel set.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index bc6e07c..ada334b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -537,8 +537,10 @@ I830MapMem(ScrnInfoPtr pScrn)
    if (!pI830->FbBase)
       return FALSE;
 
-   if (I830IsPrimary(pScrn))
-   pI830->LpRing->virtual_start = pI830->FbBase + pI830->LpRing->mem->offset;
+   if (I830IsPrimary(pScrn) && pI830->LpRing->mem != NULL) {
+      pI830->LpRing->virtual_start =
+	 pI830->FbBase + pI830->LpRing->mem->offset;
+   }
 
    return TRUE;
 }