xf86-video-intel: src/i830_memory.c

[Zhenyu Wang]

 src/i830_memory.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit aa3ac79759581b5eb05293a8cbcf89eb5b76712c
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Thu Jan 31 18:26:46 2008 +0800

    Don't crash if SW cursor
    
    In case of device option or hw cursor allocation fails.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index d97ca0b..06c21ac 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -1946,7 +1946,8 @@ i830_bind_all_memory(ScrnInfoPtr pScrn)
 	}
 #endif
     }
-    i830_update_cursor_offsets(pScrn);
+    if (!pI830->SWCursor)
+	i830_update_cursor_offsets(pScrn);
 
     return TRUE;
 }